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

Unified Diff: core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp

Issue 1374633004: Disable JBIG2 cache; prevent data corruption - try 2. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: nit Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « core/src/fxcodec/jbig2/JBig2_SymbolDict.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp
diff --git a/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp b/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp
index ef02df107265a326829cd9f4177bada85bd311e3..1ec56dfacc1acbf9a58bc6d59de7193722dc410c 100644
--- a/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp
@@ -7,6 +7,7 @@
#include "JBig2_SymbolDict.h"
#include "../../../include/fxcrt/fx_memory.h"
+#include "JBig2_Image.h"
CJBig2_SymbolDict::CJBig2_SymbolDict() {
SDNUMEXSYMS = 0;
@@ -15,15 +16,16 @@ CJBig2_SymbolDict::CJBig2_SymbolDict() {
m_gbContext = m_grContext = NULL;
}
-CJBig2_SymbolDict* CJBig2_SymbolDict::DeepCopy() {
- CJBig2_SymbolDict* src = this;
- if (src->m_bContextRetained || src->m_gbContext || src->m_grContext) {
- return NULL;
- }
- CJBig2_SymbolDict* dst = new CJBig2_SymbolDict;
+nonstd::unique_ptr<CJBig2_SymbolDict> CJBig2_SymbolDict::DeepCopy() const {
+ nonstd::unique_ptr<CJBig2_SymbolDict> dst;
+ const CJBig2_SymbolDict* src = this;
+ if (src->m_bContextRetained || src->m_gbContext || src->m_grContext)
+ return dst;
+
+ dst.reset(new CJBig2_SymbolDict);
dst->SDNUMEXSYMS = src->SDNUMEXSYMS;
dst->SDEXSYMS = FX_Alloc(CJBig2_Image*, src->SDNUMEXSYMS);
- for (FX_DWORD i = 0; i < src->SDNUMEXSYMS; i++) {
+ for (FX_DWORD i = 0; i < src->SDNUMEXSYMS; ++i) {
if (src->SDEXSYMS[i]) {
dst->SDEXSYMS[i] = new CJBig2_Image(*(src->SDEXSYMS[i]));
} else {
« no previous file with comments | « core/src/fxcodec/jbig2/JBig2_SymbolDict.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698