Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(70)

Side by Side Diff: core/src/fxcrt/fxcrt_platforms.cpp

Issue 1145843005: Revert "Remove FX_Alloc() null checks now that it can't return NULL." (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « core/src/fxcrt/fx_extension.cpp ('k') | core/src/fxcrt/fxcrt_posix.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "../../include/fxcrt/fx_ext.h" 7 #include "../../include/fxcrt/fx_ext.h"
8 #include "fxcrt_platforms.h" 8 #include "fxcrt_platforms.h"
9 #if (_FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ && _FXM_PLATFORM_ != _FXM_PLATFORM _LINUX_ && _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_ && _FXM_PLATFORM_ != _FXM_PLAT FORM_ANDROID_) 9 #if (_FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ && _FXM_PLATFORM_ != _FXM_PLATFORM _LINUX_ && _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_ && _FXM_PLATFORM_ != _FXM_PLAT FORM_ANDROID_)
10 IFXCRT_FileAccess* FXCRT_FileAccess_Create() 10 IFXCRT_FileAccess* FXCRT_FileAccess_Create()
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 } 162 }
163 FX_FILESIZE size = src.GetSize(); 163 FX_FILESIZE size = src.GetSize();
164 if (!size) { 164 if (!size) {
165 return FALSE; 165 return FALSE;
166 } 166 }
167 if (!dst.Open(fileNameDst, FX_FILEMODE_Truncate)) { 167 if (!dst.Open(fileNameDst, FX_FILEMODE_Truncate)) {
168 return FALSE; 168 return FALSE;
169 } 169 }
170 FX_FILESIZE num = 0; 170 FX_FILESIZE num = 0;
171 FX_LPBYTE pBuffer = FX_Alloc(FX_BYTE, 32768); 171 FX_LPBYTE pBuffer = FX_Alloc(FX_BYTE, 32768);
172 if (!pBuffer) {
173 return FALSE;
174 }
172 while (num = src.Read(pBuffer, 32768)) { 175 while (num = src.Read(pBuffer, 32768)) {
173 if (dst.Write(pBuffer, num) != num) { 176 if (dst.Write(pBuffer, num) != num) {
174 break; 177 break;
175 } 178 }
176 } 179 }
177 FX_Free(pBuffer); 180 FX_Free(pBuffer);
178 return TRUE; 181 return TRUE;
179 } 182 }
180 FX_BOOL FX_File_Copy(FX_WSTR fileNameSrc, FX_WSTR fileNameDst) 183 FX_BOOL FX_File_Copy(FX_WSTR fileNameSrc, FX_WSTR fileNameDst)
181 { 184 {
182 return FX_File_Copy(FX_UTF8Encode(fileNameSrc), FX_UTF8Encode(fileNameDst)); 185 return FX_File_Copy(FX_UTF8Encode(fileNameSrc), FX_UTF8Encode(fileNameDst));
183 } 186 }
184 FX_BOOL FX_File_Move(FX_BSTR fileNameSrc, FX_BSTR fileNameDst) 187 FX_BOOL FX_File_Move(FX_BSTR fileNameSrc, FX_BSTR fileNameDst)
185 { 188 {
186 return rename(fileNameSrc.GetCStr(), fileNameDst.GetCStr()); 189 return rename(fileNameSrc.GetCStr(), fileNameDst.GetCStr());
187 } 190 }
188 FX_BOOL FX_File_Move(FX_WSTR fileNameSrc, FX_WSTR fileNameDst) 191 FX_BOOL FX_File_Move(FX_WSTR fileNameSrc, FX_WSTR fileNameDst)
189 { 192 {
190 return FX_File_Move(FX_UTF8Encode(fileNameSrc), FX_UTF8Encode(fileNameDst)); 193 return FX_File_Move(FX_UTF8Encode(fileNameSrc), FX_UTF8Encode(fileNameDst));
191 } 194 }
192 #endif 195 #endif
OLDNEW
« no previous file with comments | « core/src/fxcrt/fx_extension.cpp ('k') | core/src/fxcrt/fxcrt_posix.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698