From: thurston <thurston@052ea7fc-9027-0410-9066-f65837a77df0>
Date: Tue, 29 Sep 2009 00:43:01 +0000 (+0000)
Subject: Fixed improper allocation of checks in makeIncludePathChecks.
X-Git-Tag: 2.0_alpha~6
X-Git-Url: http://review.tizen.org/git/?p=external%2Fragel.git;a=commitdiff_plain;h=c4469fdddf745500ff5c383182784b68fa92fa53

Fixed improper allocation of checks in makeIncludePathChecks.


git-svn-id: http://svn.complang.org/ragel/trunk@1078 052ea7fc-9027-0410-9066-f65837a77df0
---

diff --git a/ragel/rlscan.rl b/ragel/rlscan.rl
index 3ec0469..f14409b 100644
--- a/ragel/rlscan.rl
+++ b/ragel/rlscan.rl
@@ -556,18 +556,21 @@ bool isAbsolutePath( const char *path )
 char **Scanner::makeIncludePathChecks( const char *thisFileName, 
 		const char *fileName, int fnlen )
 {
-	char **checks = new char*[2];
+	char **checks = 0;
 	long nextCheck = 0;
-
-	bool caseInsensitive = false;
 	long length = 0;
+	bool caseInsensitive = false;
 	char *data = prepareLitString( InputLoc(), fileName, fnlen, 
 			length, caseInsensitive );
 
 	/* Absolute path? */
-	if ( isAbsolutePath( data ) )
+	if ( isAbsolutePath( data ) ) {
+		checks = new char*[2];
 		checks[nextCheck++] = data;
+	}
 	else {
+		checks = new char*[2 + id.includePaths.length()];
+
 		/* Search from the the location of the current file. */
 		const char *lastSlash = strrchr( thisFileName, PATH_SEP );
 		if ( lastSlash == 0 )