diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2017-09-27 10:53:11 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-27 16:11:38 +0000 |
| commit | 875e98c581952478f3a3ccef9b2f2e3ed06c5346 (patch) | |
| tree | 8e0d7e032056bf4c73d6da43c0f3ce4eadb74dfd /core/fxcodec/codec/ccodec_pngmodule.cpp | |
| parent | cc3a3ee3ebcc1baabdfa7ffca5876dbbfa3980c1 (diff) | |
| download | pdfium-875e98c581952478f3a3ccef9b2f2e3ed06c5346.tar.xz | |
Remove FX_STRSIZE and replace with size_t
BUG=pdfium:828
Change-Id: I5c40237433ebabaeabdb43aec9cdf783e41dfe16
Reviewed-on: https://pdfium-review.googlesource.com/13230
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'core/fxcodec/codec/ccodec_pngmodule.cpp')
| -rw-r--r-- | core/fxcodec/codec/ccodec_pngmodule.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/fxcodec/codec/ccodec_pngmodule.cpp b/core/fxcodec/codec/ccodec_pngmodule.cpp index a08e72f86d..d500745ca7 100644 --- a/core/fxcodec/codec/ccodec_pngmodule.cpp +++ b/core/fxcodec/codec/ccodec_pngmodule.cpp @@ -74,7 +74,7 @@ static void _png_load_bmp_attribute(png_structp png_ptr, #endif #if defined(PNG_TEXT_SUPPORTED) int i; - FX_STRSIZE len; + size_t len; const char* buf; int num_text; png_textp text = nullptr; @@ -86,8 +86,10 @@ static void _png_load_bmp_attribute(png_structp png_ptr, buf = "Author"; if (!memcmp(buf, text[i].key, std::min(len, FXSYS_strlen(buf)))) { pAttribute->m_strAuthor = - ByteString(reinterpret_cast<uint8_t*>(text[i].text), - static_cast<FX_STRSIZE>(text[i].text_length)); + text[i].text_length > 0 + ? ByteString(reinterpret_cast<uint8_t*>(text[i].text), + static_cast<size_t>(text[i].text_length)) + : ByteString(); } } } |