kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added extra safety checks to TagLib string union handling

CQTexperiment
Chris Moeller 2013-11-11 06:30:19 -08:00
parent ce56e727c9
commit f56edd882e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Frameworks/TagLib/taglib/taglib/tagunion.cpp
View File

@ -28,11 +28,11 @@
using namespace TagLib; using namespace TagLib;
#define stringUnion(method) \ #define stringUnion(method) \
if(tag(0) && !tag(0)->method().isEmpty()) \ if(tag(0) && !tag(0)->method().isNull() && !tag(0)->method().isEmpty()) \
return tag(0)->method(); \ return tag(0)->method(); \
if(tag(1) && !tag(1)->method().isEmpty()) \ if(tag(1) && !tag(1)->method().isNull() && !tag(1)->method().isEmpty()) \
return tag(1)->method(); \ return tag(1)->method(); \
if(tag(2) && !tag(2)->method().isEmpty()) \ if(tag(2) && !tag(2)->method().isNull() && !tag(2)->method().isEmpty()) \
return tag(2)->method(); \ return tag(2)->method(); \
return String::null \ return String::null \