change #9000: fixes after merge

Author: dawesc

include/json/allocator.h

@@ -8,6 +8,11 @@
 
 #include <cstring>
 #include <memory>
+#if defined(__STDC_LIB_EXT1__) && defined(__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__ == 1
+//We have memset_s from cstring
+#else
+#include <algorithm>
+#endif
 
 #pragma pack(push)
 #pragma pack()
@@ -39,7 +44,12 @@ template <typename T> class SecureAllocator {
    */
   void deallocate(pointer p, size_type n) {
     // memset_s is used because memset may be optimized away by the compiler
+#if defined(__STDC_LIB_EXT1__) && defined(__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__ == 1
     memset_s(p, n * sizeof(T), 0, n * sizeof(T));
+#else
+    // fallback for systems without memset_s (e.g., most Linux distros)
+    std::fill_n(p, n, T());
+#endif
     // free using "global operator delete"
     ::operator delete(p);
   }

include/json/value.h

@@ -392,16 +392,18 @@ class JSON_API Value {
   unsigned getCStringLength() const; //Allows you to understand the length of the CString
   template<typename T = JSONCPP_STRING>
   T asString() const { ///< Embedded zeroes are possible.
-    switch (type_) {
+    switch (type()) {
     case nullValue:
       return "";
     case stringValue:
     {
-      if (value_.string_ == 0) return "";
+      if (value_.string_ == nullptr)
+      return "";
       unsigned this_len;
       char const* this_str;
-      decodePrefixedString(this->allocated_, this->value_.string_, &this_len, &this_str);
-      return T(this_str, this_str + this_len);
+      decodePrefixedString(this->isAllocated(), this->value_.string_, &this_len,
+                          &this_str);
+      return T(this_str, this_len);
     }
     case booleanValue:
       return value_.bool_ ? "true" : "false";
@@ -589,9 +591,6 @@ class JSON_API Value {
   /// \post type() is unchanged
   void removeMember(const char* key);
 
-  /// Same as removeMember(JSONCPP_STRING const& key, Value* removed)
-  bool removeMember(const char* begin, const char* end, Value* removed);
-
 #if JSONCPP_USING_SECURE_MEMORY
   /// Same as removeMember(const char*)
   /// \param key may contain embedded nulls.
@@ -643,8 +642,6 @@ class JSON_API Value {
   /// Return true if the object has a member named key.
   /// \note 'key' must be null-terminated.
   bool isMember(const char* key) const;
-  /// Same as isMember(JSONCPP_STRING const& key)const
-  bool isMember(const char* begin, const char* end) const;
 #if JSONCPP_USING_SECURE_MEMORY
   /// Return true if the object has a member named key.
   /// \param key may contain embedded nulls.

src/lib_json/json_value.cpp

@@ -131,7 +131,7 @@ static inline char* duplicateStringValue(const char* value, size_t length) {
 /* Record the length as a prefix.
  */
 #if JSONCPP_USING_SECURE_MEMORY
-char* duplicateAndPrefixStringValue(const char* value,
+char* Value::duplicateAndPrefixStringValue(const char* value,
   unsigned int length) {
 #else
 static inline char* duplicateAndPrefixStringValue(const char* value,