From c3e5d0bb79ab57d8fa8b1c21c59db1781831ed9d Mon Sep 17 00:00:00 2001 From: malard Date: Wed, 1 Sep 2010 19:05:26 +0000 Subject: Fixed crash with unexpectedly formed JSON query. git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@33401 568bbfeb-2a22-0410-94d2-cc84cf5bfa90 --- lib/jsoncpp/jsoncpp/src/lib_json/json_value.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/jsoncpp') diff --git a/lib/jsoncpp/jsoncpp/src/lib_json/json_value.cpp b/lib/jsoncpp/jsoncpp/src/lib_json/json_value.cpp index 734bf16252..bee3f70f64 100644 --- a/lib/jsoncpp/jsoncpp/src/lib_json/json_value.cpp +++ b/lib/jsoncpp/jsoncpp/src/lib_json/json_value.cpp @@ -1047,8 +1047,8 @@ Value::isValidIndex( UInt index ) const const Value & Value::operator[]( const char *key ) const { - JSON_ASSERT( type_ == nullValue || type_ == objectValue ); - if ( type_ == nullValue ) + JSON_ASSERT( type_ == nullValue || type_ == objectValue || type_ == arrayValue ); + if ( type_ == nullValue || type_ == arrayValue) return null; #ifndef JSON_VALUE_USE_INTERNAL_MAP CZString actualKey( key, CZString::noDuplication ); -- cgit v1.2.3