summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorNicolas Pena <npm@chromium.org>2017-04-18 15:36:29 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-04-18 20:24:11 +0000
commit152bfe0f60763263e8bf7292762885eb2aec9b85 (patch)
tree0ab40515446a4a4d8c779d39aae0707682a9fffe /core
parent9bd8b4c8687cc95bed5df131ca8764f9ce203944 (diff)
downloadpdfium-152bfe0f60763263e8bf7292762885eb2aec9b85.tar.xz
Libtiff upstream: _TIFFcalloc addition
Upstream commit: https://github.com/vadz/libtiff/commit/d60332057b9575ada4f264489582b13e30137be1 Bug: chromium:711638 Change-Id: I46de1a00f9bb8d5de8df64ec78a9d62dcb4352ed Reviewed-on: https://pdfium-review.googlesource.com/4310 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'core')
-rw-r--r--core/fxcodec/codec/ccodec_tiffmodule.cpp4
-rw-r--r--core/fxcrt/fx_basic_memmgr.cpp6
-rw-r--r--core/fxcrt/fx_memory.h1
3 files changed, 11 insertions, 0 deletions
diff --git a/core/fxcodec/codec/ccodec_tiffmodule.cpp b/core/fxcodec/codec/ccodec_tiffmodule.cpp
index 295f0abe34..3c24c33286 100644
--- a/core/fxcodec/codec/ccodec_tiffmodule.cpp
+++ b/core/fxcodec/codec/ccodec_tiffmodule.cpp
@@ -62,6 +62,10 @@ class CCodec_TiffContext {
TIFF* m_tif_ctx;
};
+void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz) {
+ return FXMEM_DefaultCalloc(nmemb, siz);
+}
+
void* _TIFFmalloc(tmsize_t size) {
return FXMEM_DefaultAlloc(size, 0);
}
diff --git a/core/fxcrt/fx_basic_memmgr.cpp b/core/fxcrt/fx_basic_memmgr.cpp
index f3aaa3678d..75bc2bc1f1 100644
--- a/core/fxcrt/fx_basic_memmgr.cpp
+++ b/core/fxcrt/fx_basic_memmgr.cpp
@@ -24,9 +24,15 @@ void FXMEM_InitalizePartitionAlloc() {
void* FXMEM_DefaultAlloc(size_t byte_size, int flags) {
return (void*)malloc(byte_size);
}
+
+void* FXMEM_DefaultCalloc(size_t num_elems, size_t byte_size) {
+ return calloc(num_elems, byte_size);
+}
+
void* FXMEM_DefaultRealloc(void* pointer, size_t new_size, int flags) {
return realloc(pointer, new_size);
}
+
void FXMEM_DefaultFree(void* pointer, int flags) {
free(pointer);
}
diff --git a/core/fxcrt/fx_memory.h b/core/fxcrt/fx_memory.h
index eb369d7d6c..684f2f2646 100644
--- a/core/fxcrt/fx_memory.h
+++ b/core/fxcrt/fx_memory.h
@@ -15,6 +15,7 @@ extern "C" {
// For external C libraries to malloc through PDFium. These may return nullptr.
void* FXMEM_DefaultAlloc(size_t byte_size, int flags);
+void* FXMEM_DefaultCalloc(size_t num_elems, size_t byte_size);
void* FXMEM_DefaultRealloc(void* pointer, size_t new_size, int flags);
void FXMEM_DefaultFree(void* pointer, int flags);