Fix NSData initWithContentsOfURL: caching data of file URLs

gnustep · Jul 26, 2023 · 2b5e054 · 2b5e054
1 parent 48c8a1a
commit 2b5e054
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2023-07-26 Frederik Seiffert <[email protected]>
+
+	* Source/NSData.m:
+	Fix NSData initWithContentsOfURL: caching data of file URLs.
+
 2023-07-26 Frederik Seiffert <[email protected]>
 
 	* Source/NSURL.m:

diff --git a/Source/NSData.m b/Source/NSData.m
@@ -643,7 +643,15 @@ + (id) dataWithContentsOfURL: (NSURL*)url
 {
   NSData	*d;
 
-  d = [url resourceDataUsingCache: YES];
+  if ([url isFileURL])
+    {
+      d = [dataMalloc allocWithZone: NSDefaultMallocZone()];
+      d = AUTORELEASE([d initWithContentsOfFile: [url path]]);
+    }
+  else
+    {
+      d = [url resourceDataUsingCache: YES];
+    }
   return d;
 }
 
@@ -955,9 +963,15 @@ - (id) initWithContentsOfMappedFile: (NSString *)path
  */
 - (id) initWithContentsOfURL: (NSURL*)url
 {
-  NSData	*data = [url resourceDataUsingCache: YES];
-
-  return [self initWithData: data];
+  if ([url isFileURL])
+    {
+      return [self initWithContentsOfFile: [url path]];
+    }
+  else
+    {
+      NSData *data = [url resourceDataUsingCache: YES];
+      return [self initWithData: data];
+    }
 }
 
 /**
@@ -2359,11 +2373,18 @@ + (id) dataWithContentsOfMappedFile: (NSString*)path
 + (id) dataWithContentsOfURL: (NSURL*)url
 {
   NSMutableData	*d;
-  NSData	*data;
 
   d = [mutableDataMalloc allocWithZone: NSDefaultMallocZone()];
-  data = [url resourceDataUsingCache: YES];
-  d = [d initWithBytes: [data bytes] length: [data length]];
+
+  if ([url isFileURL])
+    {
+      d = [d initWithContentsOfFile: [url path]];
+    }
+  else
+    {
+      NSData *data = [url resourceDataUsingCache: YES];
+      d = [d initWithBytes: [data bytes] length: [data length]];
+    }
   return AUTORELEASE(d);
 }