| commit | f0a5576384e6def4f1fe78d6e0b12b0a9d710bf8 | [log] [tgz] |
|---|---|---|
| author | John Abd-El-Malek <jam@chromium.org> | Thu Jun 05 11:12:52 2014 -0700 |
| committer | John Abd-El-Malek <jam@chromium.org> | Thu Jun 05 11:12:52 2014 -0700 |
| tree | 5b8ddc93dd549f9b63e9216fa85673ba7e6f454b | |
| parent | bb2b1e72929fb78f9d5b64b3732ed9b5cc93af4e [diff] |
fix two uninitialized reads https://code.google.com/p/pdfium/issues/detail?id=9 https://code.google.com/p/pdfium/issues/detail?id=10 BUG= R=bo_xu@foxitsoftware.com Review URL: https://codereview.chromium.org/312273002
diff --git a/AUTHORS b/AUTHORS index bf6d071..b7eefe1 100644 --- a/AUTHORS +++ b/AUTHORS
@@ -12,6 +12,7 @@ Finnur Thorarinsson <finnur@chromium.org> John Abd-El-Malek <jam@chromium.org> Julien Tinnes <jln@chromium.org> +Kostya Serebryany <kcc@chromium.org> Lei Zhang <thestig@chromium.org> Lucas Nihlen <luken@chromium.org> Matt Giuca <mgiuca@chromium.org>
diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp index b0a6bd4..aae3e24 100644 --- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp
@@ -282,6 +282,7 @@ jerr.output_message = _error_do_nothing; jerr.format_message = _error_do_nothing2; jerr.reset_error_mgr = _error_do_nothing; + jerr.trace_level = 0; cinfo.err = &jerr; jmp_buf mark; cinfo.client_data = &mark;
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/psaux/psconv.c b/core/src/fxge/fx_freetype/fxft2.5.01/src/psaux/psconv.c index 22e2f7d..c13d41b 100644 --- a/core/src/fxge/fx_freetype/fxft2.5.01/src/psaux/psconv.c +++ b/core/src/fxge/fx_freetype/fxft2.5.01/src/psaux/psconv.c
@@ -202,7 +202,7 @@ FT_INT64 integral = 0; FT_INT64 decimal = 0; #else - FT_Long integral; + FT_Long integral = 0; FT_Long decimal = 0; FT_Int temp0 = 65536; FT_Int temp1 = power_ten;