Author: gcasa
Date: Mon Mar 2 23:51:36 2015
New Revision: 38376
URL: http://svn.gna.org/viewcvs/gnustep?rev=38376&view=rev
Log:
Fixes crash seen after last commit.
Modified:
apps/gorm/trunk/ChangeLog
apps/gorm/trunk/GormObjCHeaderParser/NSScanner+OCHeaderParser.m
apps/gorm/trunk/GormObjCHeaderParser/OCHeaderParser.m
Modified: apps/gorm/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gorm/trunk/ChangeLog?rev=38376&r1=38375&r2=38376&view=diff
==============================================================================
--- apps/gorm/trunk/ChangeLog (original)
+++ apps/gorm/trunk/ChangeLog Mon Mar 2 23:51:36 2015
@@ -1,3 +1,9 @@
+2015-03-02 00:04-EST Gregory John Casamento <[email protected]>
+
+ * GormObjCHeaderParser/NSScanner+OCHeaderParser.m
+ * GormObjCHeaderParser/OCHeaderParser.m: Fix for crash seen after
+ last commit.
+
2015-03-02 00:04-EST Gregory John Casamento <[email protected]>
* GormObjCHeaderParser/OCHeaderParser.m: Add _stripRedundantStatements
Modified: apps/gorm/trunk/GormObjCHeaderParser/NSScanner+OCHeaderParser.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gorm/trunk/GormObjCHeaderParser/NSScanner%2BOCHeaderParser.m?rev=38376&r1=38375&r2=38376&view=diff
==============================================================================
--- apps/gorm/trunk/GormObjCHeaderParser/NSScanner+OCHeaderParser.m
(original)
+++ apps/gorm/trunk/GormObjCHeaderParser/NSScanner+OCHeaderParser.m Mon Mar
2 23:51:36 2015
@@ -30,25 +30,31 @@
- (void) scanUpToAndIncludingString: (NSString *)string
intoString: (NSString **)buffer
{
- NSString *buffer2;
+ NSString *buffer2 = nil;
[self scanUpToString: string intoString: buffer];
[self scanString: string intoString: &buffer2];
+
if(buffer != NULL)
{
- *buffer = [*buffer stringByAppendingString: buffer2];
+ if(*buffer != NULL)
+ {
+ *buffer = [*buffer stringByAppendingString: buffer2];
+ }
}
-
}
- (void) scanUpToAndIncludingCharactersFromSet: (NSCharacterSet *)set
intoString: (NSString **)buffer
{
- NSString *buffer2;
+ NSString *buffer2 = nil;
[self scanUpToCharactersFromSet: set intoString: buffer];
[self scanCharactersFromSet: set intoString: &buffer2];
if(buffer != NULL)
{
- *buffer = [*buffer stringByAppendingString: buffer2];
+ if(*buffer != NULL)
+ {
+ *buffer = [*buffer stringByAppendingString: buffer2];
+ }
}
}
@end
Modified: apps/gorm/trunk/GormObjCHeaderParser/OCHeaderParser.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gorm/trunk/GormObjCHeaderParser/OCHeaderParser.m?rev=38376&r1=38375&r2=38376&view=diff
==============================================================================
--- apps/gorm/trunk/GormObjCHeaderParser/OCHeaderParser.m (original)
+++ apps/gorm/trunk/GormObjCHeaderParser/OCHeaderParser.m Mon Mar 2
23:51:36 2015
@@ -101,7 +101,7 @@
[scanner setCharactersToBeSkipped: nil];
while(![scanner isAtEnd])
{
- NSString *tempString = nil;
+ NSString *tempString = @"";
[scanner scanUpToString: @"#" intoString: &tempString];
[scanner scanUpToAndIncludingString: @"\n" intoString: NULL];
resultString = [resultString stringByAppendingString: tempString];
@@ -121,6 +121,8 @@
while(![scanner isAtEnd])
{
NSString *tempString = nil, *aString = nil;
+ // [scanner scanUpToString: @";" intoString: &tempString];
+ // [scanner scanString: @";" intoString: &tempString2];
[scanner scanUpToAndIncludingString: @";" intoString: &tempString];
// Scan any redundant ";" characters into aString... once it
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
