nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some fixes found by coverity for things used before a null check

Browse source 
In the second case, we actually check the wrong variable.
This commit is contained in:
Mikael Magnusson 2014-10-28 05:20:10 +01:00
parent 1491e196f3
commit 122e2a81d3
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
obrender/image.c
View file

@ -243,7 +243,7 @@ RrImageSet* RrImageSetMergeSets(RrImageSet *b, RrImageSet *a)
gint n_original, n_resized, tmp; gint n_original, n_resized, tmp;
GSList *it; GSList *it;
const gint max_resized = a->cache->max_resized_saved; gint max_resized;
if (!a) if (!a)
return b; return b;
@ -251,7 +251,6 @@ RrImageSet* RrImageSetMergeSets(RrImageSet *b, RrImageSet *a)
return a; return a;
if (a == b) if (a == b)
return b; return b;
/* the original and resized picture lists in an RrImageSet are kept ordered /* the original and resized picture lists in an RrImageSet are kept ordered
as newest to oldest. we don't have timestamps for them, so we cannot as newest to oldest. we don't have timestamps for them, so we cannot
preserve this in the merged RrImageSet exactly. a decent approximation, preserve this in the merged RrImageSet exactly. a decent approximation,
@ -264,6 +263,8 @@ RrImageSet* RrImageSetMergeSets(RrImageSet *b, RrImageSet *a)
g_assert(b->cache == a->cache); g_assert(b->cache == a->cache);
max_resized = a->cache->max_resized_saved;
a_i = b_i = merged_i = 0; a_i = b_i = merged_i = 0;
n_original = a->n_original + b->n_original; n_original = a->n_original + b->n_original;
original = g_new(RrImagePic*, n_original); original = g_new(RrImagePic*, n_original);

2
obt/xml.c
View file

@ -281,7 +281,7 @@ gboolean obt_xml_load_mem(ObtXmlInst *i,
xmlResetLastError(); xmlResetLastError();
i->doc = xmlParseMemory(data, len); i->doc = xmlParseMemory(data, len);
if (i) { if (i->doc) {
i->root = xmlDocGetRootElement(i->doc); i->root = xmlDocGetRootElement(i->doc);
if (!i->root) { if (!i->root) {
xmlFreeDoc(i->doc); xmlFreeDoc(i->doc);