diff options
| author | malard <malard@svn> | 2010-09-01 19:09:48 +0000 |
|---|---|---|
| committer | malard <malard@svn> | 2010-09-01 19:09:48 +0000 |
| commit | 5d12e3cba48a6d3ddbbd993b272baae800590358 (patch) | |
| tree | f45249bb5b813d109ffad6dbf56d3febcffe7fc8 /lib | |
| parent | 6e4da5183b9fc8635d493afc44ec4b79389b3c3c (diff) | |
Fixed crash with unexpectedly formed JSON query.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@33402 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/jsoncpp/jsoncpp/src/lib_json/json_value.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 ); |