From 9b43a43568877282b6a70d3a8da6ef78e6acc4e2 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 12 May 2015 14:58:44 -0700 Subject: Merge to XFA: Restore checked strlen conversions. Original Review URL: https://codereview.chromium.org/1133323003 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1130903005 --- core/include/fxcrt/fx_system.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'core/include/fxcrt') 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