From feb10c58777949ea3d300b7554204edde422d1f2 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 12 May 2015 14:49:29 -0700 Subject: Restore checked strlen conversions. The checked conversion can be re-enabled now that there is a public API free of private headers like this one. This reverts commit 6661fd4c26106cd530d187b36f29be7e5c98b70f. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1133323003 --- core/include/fxcrt/fx_system.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h index 37af19c769..9cc165f7a5 100644 --- a/core/include/fxcrt/fx_system.h +++ b/core/include/fxcrt/fx_system.h @@ -192,8 +192,16 @@ void FXSYS_vsnprintf(char *str, size_t size, const char* fmt, va_list ap); FXSYS_FILE* FXSYS_wfopen(FX_LPCWSTR filename, FX_LPCWSTR mode); #endif +#ifdef __cplusplus +} // extern "C" +#include "../../../third_party/base/numerics/safe_conversions.h" +#define FXSYS_strlen(ptr) pdfium::base::checked_cast(strlen(ptr)) +#define FXSYS_wcslen(ptr) pdfium::base::checked_cast(wcslen(ptr)) +extern "C" { +#else #define FXSYS_strlen(ptr) ((FX_STRSIZE)strlen(ptr)) #define FXSYS_wcslen(ptr) ((FX_STRSIZE)wcslen(ptr)) +#endif #define FXSYS_wcscmp wcscmp #define FXSYS_wcschr wcschr -- cgit v1.2.3