third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not deference value when it does not exist (Thanks D4N)

Browse Source
This commit is contained in:
Luis Díaz Más 2017-12-21 16:39:43 +01:00
parent 01a5d863ad
commit d21e794239
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
samples/exiv2json.cpp
View File

@ -148,6 +148,11 @@ bool isArray(std::string& value)
template <class T>
void push(Jzon::Node& node,const std::string& key,T i)
{
#define ABORT_IF_I_EMTPY \
if (i->value().size() == 0) { \
return; \
}
std::string value = i->value().toString();
switch ( i->typeId() ) {
@ -179,6 +184,7 @@ void push(Jzon::Node& node,const std::string& key,T i)
case Exiv2::unsignedRational:
case Exiv2::signedRational: {
ABORT_IF_I_EMTPY
Jzon::Array arr;
Exiv2::Rational rat = i->value().toRational();
arr.Add(rat.first );
@ -187,6 +193,7 @@ void push(Jzon::Node& node,const std::string& key,T i)
} break;
case Exiv2::langAlt: {
ABORT_IF_I_EMTPY
Jzon::Object l ;
const Exiv2::LangAltValue& langs = dynamic_cast<const Exiv2::LangAltValue&>(i->value());
for ( Exiv2::LangAltValue::ValueType::const_iterator lang = langs.value_.begin()