From 0e9df92aef86421374ca1756ff3cbfa4c386c822 Mon Sep 17 00:00:00 2001 From: Bibiko Date: Fri, 9 Oct 2009 10:13:42 +0000 Subject: =?UTF-8?q?=E2=80=A2=20fixed=20bug=20while=20parsing=20the=20CREAT?= =?UTF-8?q?E=20TABLE=20syntax=20if=20a=20column=20name=20contains=20a=20'#?= =?UTF-8?q?'=20or=20'/*'=20-=20this=20fixes=20issue=20431=20-=20furthermor?= =?UTF-8?q?e=20if=20the=20parsing=20process=20fails=20for=20some=20other?= =?UTF-8?q?=20reasons,=20i.e.=20a=20table=20name=20is=20NULL=20or=20empty?= =?UTF-8?q?=20SP=20alerts=20the=20user=20about=20it=20instead=20of=20stall?= =?UTF-8?q?ing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/SPSQLParser.m | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'Source/SPSQLParser.m') diff --git a/Source/SPSQLParser.m b/Source/SPSQLParser.m index 0b968d0a..4484c4c2 100644 --- a/Source/SPSQLParser.m +++ b/Source/SPSQLParser.m @@ -42,6 +42,10 @@ TO_BUFFER_STATE to_scan_string (const char *); */ @implementation SPSQLParser : NSMutableString +- (void)setIgnoringCommentStrings:(BOOL)ignoringCommentStrings +{ + ignoreCommentStrings = ignoringCommentStrings; +} /* * Removes comments within the current string, trimming "#", "--[/s]", and "/* * /" style strings. @@ -554,11 +558,13 @@ TO_BUFFER_STATE to_scan_string (const char *); break; case '#': + if(ignoreCommentStrings) break; currentStringIndex = [self endIndexOfCommentOfType:SPHashComment startingAtIndex:currentStringIndex]; break; // For comments starting "/*", ensure the start syntax is valid before proceeding. case '/': + if(ignoreCommentStrings) break; if (stringLength < currentStringIndex + 1) break; if ((unichar)(long)(*charAtIndex)(self, @selector(charAtIndex:), currentStringIndex+1) != '*') break; currentStringIndex = [self endIndexOfCommentOfType:SPCStyleComment startingAtIndex:currentStringIndex]; @@ -642,11 +648,13 @@ TO_BUFFER_STATE to_scan_string (const char *); break; case '#': + if(ignoreCommentStrings) break; currentStringIndex = [self endIndexOfCommentOfType:SPHashComment startingAtIndex:currentStringIndex]; break; // For comments starting "/*", ensure the start syntax is valid before proceeding. case '/': + if(ignoreCommentStrings) break; if (stringLength < currentStringIndex + 1) break; if ((unichar)(long)(*charAtIndex)(self, @selector(charAtIndex:), currentStringIndex+1) != '*') break; currentStringIndex = [self endIndexOfCommentOfType:SPCStyleComment startingAtIndex:currentStringIndex]; @@ -849,12 +857,15 @@ TO_BUFFER_STATE to_scan_string (const char *); /* Required and primitive methods to allow subclassing class cluster */ #pragma mark - - (id) init { + if (self = [super init]) { string = [[NSMutableString string] retain]; } parsedToChar = '\0'; parsedToPosition = -1; charCacheEnd = -1; + ignoreCommentStrings = NO; + return self; } - (id) initWithBytes:(const void *)bytes length:(unsigned int)length encoding:(NSStringEncoding)encoding { -- cgit v1.2.3