Fix a heap buffer overflow issue in CPDF_CMap::GetNextChar
[pdfium.git] / core / include / fxcrt / fx_stream.h
index e54af57..6732789 100644 (file)
@@ -6,9 +6,10 @@
 
 #ifndef _FX_STREAM_H_
 #define _FX_STREAM_H_
-#ifndef _FX_MEMORY_H_
+
 #include "fx_memory.h"
-#endif
+#include "fx_string.h"
+
 void* FX_OpenFolder(FX_LPCSTR path);
 void* FX_OpenFolder(FX_LPCWSTR path);
 FX_BOOL FX_GetNextFile(void* handle, CFX_ByteString& filename, FX_BOOL& bFolder);
@@ -30,7 +31,6 @@ FX_DEFINEHANDLE(FX_HFILE)
 #endif
 #define FX_FILESIZE                    off_t
 #endif
-typedef base::CheckedNumeric<FX_FILESIZE>    FX_SAFE_FILESIZE;
 #define FX_GETBYTEOFFSET32(a)  0
 #define FX_GETBYTEOFFSET40(a)  0
 #define FX_GETBYTEOFFSET48(a)  0