follow-up invent.c
This commit is contained in:
+1
-1
@@ -4880,7 +4880,7 @@ mergable(
|
|||||||
if ((objnamelth != otmpnamelth
|
if ((objnamelth != otmpnamelth
|
||||||
&& ((objnamelth && otmpnamelth) || obj->otyp == CORPSE))
|
&& ((objnamelth && otmpnamelth) || obj->otyp == CORPSE))
|
||||||
|| (objnamelth && otmpnamelth
|
|| (objnamelth && otmpnamelth
|
||||||
/* safe_oname could have returned ptr to "", verify before deref */
|
/* verify pointers before deref for static analyzer */
|
||||||
&& has_oname(obj) && has_oname(otmp)
|
&& has_oname(obj) && has_oname(otmp)
|
||||||
&& strncmp(ONAME(obj), ONAME(otmp), objnamelth)))
|
&& strncmp(ONAME(obj), ONAME(otmp), objnamelth)))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|||||||
Reference in New Issue
Block a user