From 3b3540d9ef6d0bbb29da98748db7384b21a8182b Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Wed, 22 Jun 2011 21:04:41 +0000 Subject: [PATCH] bug#2407932: strpbrk() could fail for NULL pointer. --- src/lib_json/json_writer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp index d307222..47e768c 100644 --- a/src/lib_json/json_writer.cpp +++ b/src/lib_json/json_writer.cpp @@ -119,6 +119,8 @@ std::string valueToString( bool value ) std::string valueToQuotedString( const char *value ) { + if (value == NULL) + return ""; // Not sure how to handle unicode... if (strpbrk(value, "\"\\\b\f\n\r\t") == NULL && !containsControlCharacter( value )) return std::string("\"") + value + "\"";