Author: rfm
Date: Wed Mar 9 15:30:33 2016
New Revision: 39501
URL: http://svn.gna.org/viewcvs/gnustep?rev=39501&view=rev
Log:
fix bug #45286
Modified:
libs/base/trunk/Source/NSString.m
Modified: libs/base/trunk/Source/NSString.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSString.m?rev=39501&r1=39500&r2=39501&view=diff
==============================================================================
--- libs/base/trunk/Source/NSString.m (original)
+++ libs/base/trunk/Source/NSString.m Wed Mar 9 15:30:33 2016
@@ -1536,9 +1536,15 @@
const unsigned char *data_bytes;
d = [[NSDataClass alloc] initWithContentsOfFile: path];
- if (d == nil)
+ if (nil == d)
{
DESTROY(self);
+ if (error != 0)
+ {
+ *error = [NSError errorWithDomain: NSCocoaErrorDomain
+ code: NSFileReadUnknownError
+ userInfo: nil];
+ }
return nil;
}
*enc = _DefaultStringEncoding;
@@ -1569,7 +1575,7 @@
}
self = [self initWithData: d encoding: *enc];
RELEASE(d);
- if (self == nil)
+ if (nil == self)
{
if (error != 0)
{
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
