Merge branch 'master' of github.com:jcupitt/nip2

jcupitt · jcupitt · commit b9bb50d85a6f · 2014-01-21T17:35:14.000Z
Conflicts:
	ChangeLog
diff --git a/ChangeLog b/ChangeLog
@@ -1,10 +1,8 @@
-<<<<<<< HEAD
-started 7.38.1 18/1/14
-- add scRGB to list of known Types
-=======
+started 7.38.2 21/1/14
+- fix a tiny mem leak
+
 started 7.38.1 20/1/14
 - fix scRGB display
->>>>>>> 2bb3de9e64a99361e6363219f301761e4b2aa7d6
 
 started 7.38.0 18/1/14
 - version bump
diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([nip2], [7.38.1])
+AC_INIT([nip2], [7.38.2])
 AM_INIT_AUTOMAKE([-Wall])
 
 # foreign stops complaints about a missing README (we use README.md instead)
@@ -18,7 +18,7 @@ dnl
 
 m4_define([nip_major_version], [7])
 m4_define([nip_minor_version], [38])
-m4_define([nip_micro_version], [1])
+m4_define([nip_micro_version], [2])
 m4_define([nip_version],
           [nip_major_version.nip_minor_version.nip_micro_version])
 
diff --git a/src/parse.y b/src/parse.y
@@ -1594,7 +1594,7 @@ free_lex( int yychar )
 }
 
 /* Do we have a string of the form "IDENT = .."? Use the lexer to look along
- * the string checking components, return the IDENT if we do. 
+ * the string checking components, return the IDENT if we do, NULL otherwise.  
  */
 char *
 parse_test_define( void )
@@ -1609,18 +1609,22 @@ parse_test_define( void )
 		/* Here for yyerror in lex. 
 		 */
 		IM_FREE( ident );
+
 		return( NULL ); 
 	}
 
 	if( (yychar = yylex()) != TK_IDENT ) {
 		free_lex( yychar );
-		yyerror( _( "no leading identifier" ) );
+
+		return( NULL ); 
 	}
 	ident = yylval.yy_name;
 
 	if( (yychar = yylex()) != '=' ) {
 		free_lex( yychar );
-		yyerror( _( "'=' missing" ) );
+		IM_FREE( ident ); 
+
+		return( NULL ); 
 	}
 
 	return( ident );
diff --git a/src/tree.c b/src/tree.c
@@ -34,7 +34,7 @@
 void
 tree_const_destroy( ParseConst *pc )
 {
-	if( pc->type == PARSE_CONST_STR )
+	if( pc->type == PARSE_CONST_STR ) 
 		IM_FREE( pc->val.str );
 	pc->type = PARSE_CONST_NONE;
 }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`void`
`35`	`35`	`tree_const_destroy( ParseConst *pc )`
`36`	`36`	`{`
`37`		`- if( pc->type == PARSE_CONST_STR )`
	`37`	`+ if( pc->type == PARSE_CONST_STR )`
`38`	`38`	`IM_FREE( pc->val.str );`
`39`	`39`	`pc->type = PARSE_CONST_NONE;`
`40`	`40`	`}`