External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the library signature more difficult to remove

Browse Source 
Use compiler-specific mechanisms to prevent the removal of the
identifying hash value and version number.
This commit is contained in:
Florian Albrechtskirchinger 2022-05-11 13:24:49 +02:00
parent d6efe672b5
commit f9594071ae
No known key found for this signature in database
GPG Key ID: 19618CE9B2D4BE6D
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/nlohmann/json.hpp
View File

@ -546,10 +546,14 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
default: default:
{ {
object = nullptr; // silence warning, see #821 object = nullptr; // silence warning, see #821
#if !(defined(__clang__) || defined(__GNUC__) || defined(_MSC_VER))
if (JSON_HEDLEY_UNLIKELY(t == value_t::null)) if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
{ {
JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.10.5", nullptr)); // LCOV_EXCL_LINE // inject a hash value into binaries using this library; this method serves as a fallback
// and is easily removed by compiler optimizations
JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.10.5", nullptr));
} }
#endif
break; break;
} }
} }
@ -5026,6 +5030,17 @@ std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
return j.dump(); return j.dump();
} }
// inject a hash value into binaries using this library; this method is inspired by
// __AFL_INIT() from AFL++ and won't be removed from optimized builds
#if defined(__clang__) || defined(__GNUC__)
static const volatile char* _NLOHMANN_JSON_SIGNATURE __attribute__((used, unused)) =
"961c151d2e87f2686a955a9be24d316f1362bf21 3.10.5";
#elif defined(_MSC_VER)
static const volatile char* _NLOHMANN_JSON_SIGNATURE =
"961c151d2e87f2686a955a9be24d316f1362bf21 3.10.5";
#pragma comment(linker, "/export:_NLOHMANN_JSON_SIGNATURE")
#endif
} // namespace nlohmann } // namespace nlohmann
/////////////////////// ///////////////////////

17
single_include/nlohmann/json.hpp
View File

@ -18630,10 +18630,14 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
default: default:
{ {
object = nullptr; // silence warning, see #821 object = nullptr; // silence warning, see #821
#if !(defined(__clang__) || defined(__GNUC__) || defined(_MSC_VER))
if (JSON_HEDLEY_UNLIKELY(t == value_t::null)) if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
{ {
JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.10.5", nullptr)); // LCOV_EXCL_LINE // inject a hash value into binaries using this library; this method serves as a fallback
// and is easily removed by compiler optimizations
JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.10.5", nullptr));
} }
#endif
break; break;
} }
} }
@ -23110,6 +23114,17 @@ std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
return j.dump(); return j.dump();
} }
// inject a hash value into binaries using this library; this method is inspired by
// __AFL_INIT() from AFL++ and won't be removed from optimized builds
#if defined(__clang__) || defined(__GNUC__)
static const volatile char* _NLOHMANN_JSON_SIGNATURE __attribute__((used, unused)) =
"961c151d2e87f2686a955a9be24d316f1362bf21 3.10.5";
#elif defined(_MSC_VER)
static const volatile char* _NLOHMANN_JSON_SIGNATURE =
"961c151d2e87f2686a955a9be24d316f1362bf21 3.10.5";
#pragma comment(linker, "/export:_NLOHMANN_JSON_SIGNATURE")
#endif
} // namespace nlohmann } // namespace nlohmann
/////////////////////// ///////////////////////