Michael Stefaniuc : wrc: Fix redundant checks for NULL before free(). Found by Smatch.

Alexandre Julliard julliard at wine.codeweavers.com
Thu Jun 14 07:47:01 CDT 2007


Module: wine
Branch: master
Commit: cb2574722e4846dcfb87e10f2349d7fcfb17800e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cb2574722e4846dcfb87e10f2349d7fcfb17800e

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Wed Jun 13 23:52:17 2007 +0200

wrc: Fix redundant checks for NULL before free(). Found by Smatch.

---

 tools/wrc/parser.y |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y
index 595042c..5806620 100644
--- a/tools/wrc/parser.y
+++ b/tools/wrc/parser.y
@@ -531,8 +531,7 @@ resource
 
 		if(!win32)
 			parser_warning("LANGUAGE not supported in 16-bit mode");
-		if(currentlanguage)
-			free(currentlanguage);
+		free(currentlanguage);
 		if (get_language_codepage($3, $5) == -1)
 			parser_error( "Language %04x is not supported", ($5<<10) + $3);
 		currentlanguage = new_language($3, $5);
@@ -1460,11 +1459,8 @@ stringtable
 			 }
 			 /* Else were done */
 		}
-		if(tagstt_memopt)
-		{
-			free(tagstt_memopt);
-			tagstt_memopt = NULL;
-		}
+		free(tagstt_memopt);
+		tagstt_memopt = NULL;
 
 		$$ = tagstt;
 		}
@@ -1477,8 +1473,7 @@ stt_head: tSTRINGTABLE loadmemopts opt_lvc {
 		tagstt_memopt = $2;
 		tagstt_version = $3->version;
 		tagstt_characts = $3->characts;
-		if($3)
-			free($3);
+		free($3);
 		}
 	;
 




More information about the wine-cvs mailing list