[Rawstudio-commit] rawspeed r344 - RawSpeed

[Klaus Post]

Author: post
Date: 2011-03-19 18:18:45 +0100 (Sat, 19 Mar 2011)
New Revision: 344

Modified:
   RawSpeed/FileMap.cpp
   RawSpeed/FileReader.cpp
Log:
Add checks in Windows compile for 0-byte files.

Modified: RawSpeed/FileMap.cpp
===================================================================
--- RawSpeed/FileMap.cpp        2011-03-19 17:17:54 UTC (rev 343)
+++ RawSpeed/FileMap.cpp        2011-03-19 17:18:45 UTC (rev 344)
@@ -25,6 +25,8 @@
 namespace RawSpeed {
 
 FileMap::FileMap(uint32 _size) : size(_size) {
+  if (!size)
+    throw FileIOException("Filemap of 0 bytes not possible");
   data = (uchar8*)_aligned_malloc(size + 4, 16);
   if (!data) {
     throw FileIOException("Not enough memory to open file.");

Modified: RawSpeed/FileReader.cpp
===================================================================
--- RawSpeed/FileReader.cpp     2011-03-19 17:17:54 UTC (rev 343)
+++ RawSpeed/FileReader.cpp     2011-03-19 17:18:45 UTC (rev 344)
@@ -80,6 +80,9 @@
   LARGE_INTEGER f_size;
   GetFileSizeEx(file_h , &f_size);
 
+  if (!f_size.LowPart)
+    throw FileIOException("File is 0 bytes.");
+
   FileMap *fileData = new FileMap(f_size.LowPart);
 
   DWORD bytes_read;


_______________________________________________
Rawstudio-commit mailing list
Rawstudio-commit@rawstudio.org
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit