Coverity #1523: Dereferencing freed pointer "mapping"

2 files changed, 14 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 860ca91..40c1285 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-02  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+	* src/encparse.c (parseEncodingFile): 
+	Coverity #1523: Dereferencing freed pointer "mapping"
+
 2006-04-26  Adam Jackson  <ajax@freedesktop.org>
 
 	* configure.ac:
diff --git a/src/encparse.c b/src/encparse.c
index 62a889d..9375ed9 100644
--- a/src/encparse.c
+++ b/src/encparse.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: $ */
+/* $XdotOrg: lib/fontenc/src/encparse.c,v 1.6 2006/04/10 16:15:12 alanc Exp $ */
 /*
 Copyright (c) 1998-2001 by Juliusz Chroboczek
 
@@ -773,12 +773,14 @@ error:
         xfree(mapping);
     }
     if(encoding) {
-        if(encoding->name) xfree(encoding->name);
-    for(mapping = encoding->mappings; mapping; mapping = mapping->next) {
-        if(mapping->client_data) xfree(mapping->client_data);
-        xfree(mapping);
-    }
-    xfree(encoding);
+	FontMapPtr nextmap;
+	if (encoding->name) xfree(encoding->name);
+	for (mapping = encoding->mappings; mapping; mapping = nextmap) {
+	    if (mapping->client_data) xfree(mapping->client_data);
+	    nextmap = mapping->next;
+	    xfree(mapping);
+	}
+	xfree(encoding);
     }
     for(i = 0; i < numaliases; i++)
         xfree(aliases[i]);