From b532634ab35447fea0b89123468b2d63869abc99 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Sun, 10 Apr 2011 22:12:34 +0000 Subject: - Fix a bug when standardising line endings, addressing multiple CRLFs - this fixes Issue #1024 --- Source/SPSQLParser.m | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Source/SPSQLParser.m') diff --git a/Source/SPSQLParser.m b/Source/SPSQLParser.m index 6485fc85..458d4e25 100644 --- a/Source/SPSQLParser.m +++ b/Source/SPSQLParser.m @@ -280,12 +280,14 @@ TO_BUFFER_STATE to_scan_string (const char *); } } - if ([carriageReturnPositions count]) { + // If any CRs were found, iterate over them backwards, converting to LFs by replacing or subtracting as appropriate + NSUInteger carriageReturnCount = [carriageReturnPositions count]; + if (carriageReturnCount) { NSMutableString *normalisedString = [NSMutableString stringWithString:queryString]; BOOL isCRLF; NSUInteger CRLocation; - for (NSNumber *position in carriageReturnPositions) { - CRLocation = [position unsignedIntegerValue]; + while ( carriageReturnCount-- ) { + CRLocation = [[carriageReturnPositions objectAtIndex:carriageReturnCount] unsignedIntegerValue]; // Check whether it's a CRLF or just a CR isCRLF = NO; -- cgit v1.2.3