summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2006-06-02 19:48:01 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2006-06-02 19:48:01 +0000
commit19855d6e09aa36db7686ad6f538179bf87e9c6ea (patch)
treede87cad33fec67badf2a895ef7c94697b16abb1f
parent000abcd371d0c4b1d0a5380023d74bf5bfc47685 (diff)
downloadxorg-lib-libXpm-19855d6e09aa36db7686ad6f538179bf87e9c6ea.tar.gz
Coverity #1432: Returned without freeing storage "hints_cmt" (in error case
when xpmHashTableInit failed)
-rw-r--r--ChangeLog4
-rw-r--r--src/create.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8f2928d..fd1a686 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2006-06-02 Alan Coopersmith <alan.coopersmith@sun.com>
+ * src/create.c (xpmParseDataAndCreate):
+ Coverity #1432: Returned without freeing storage "hints_cmt"
+ (in error case when xpmHashTableInit failed)
+
* src/parse.c (xpmParseData):
Coverity #1415: Returned without freeing storage "hints_cmt"
(in error case when xpmHashTableInit failed)
diff --git a/src/create.c b/src/create.c
index abc9d59..e3179f7 100644
--- a/src/create.c
+++ b/src/create.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/extras/Xpm/lib/create.c,v 1.4 2004/11/25 21:19:11 herrb Exp $ */
+/* $XdotOrg: lib/Xpm/src/create.c,v 1.6 2005/05/19 15:02:48 sandmann Exp $ */
/*
* Copyright (C) 1989-95 GROUPE BULL
*
@@ -2080,12 +2080,12 @@ xpmParseDataAndCreate(display, data, image_return, shapeimage_return,
xpmGetCmt(data, &hints_cmt);
/*
- * init the hastable
+ * init the hashtable
*/
if (USE_HASHTABLE) {
ErrorStatus = xpmHashTableInit(&hashtable);
if (ErrorStatus != XpmSuccess)
- return (ErrorStatus);
+ RETURN(ErrorStatus);
}
/*