summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-04-26 06:55:49 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-04-26 06:55:49 +0000
commit95a7907ce592bb7ac0e4b829de095ba021a251a8 (patch)
tree2107501bca643deb0e498b45dffa3f74cab61bbe
parent7934426914a7efcaf31adcf990733525209b0d7d (diff)
dvipdfmx: Enable and try to avoid mem_debug_check warning
git-svn-id: svn://tug.org/texlive/trunk@26144 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/xdvipdfmx/ChangeLog.TL8
-rw-r--r--Build/source/texk/xdvipdfmx/src/dvipdfmx.c3
-rw-r--r--Build/source/texk/xdvipdfmx/src/mem.c8
-rw-r--r--Build/source/texk/xdvipdfmx/src/mem.h2
-rw-r--r--Build/source/texk/xdvipdfmx/src/spc_pdfm.c1
5 files changed, 15 insertions, 7 deletions
diff --git a/Build/source/texk/xdvipdfmx/ChangeLog.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL
index 452f62a6375..3293ccb3bd5 100644
--- a/Build/source/texk/xdvipdfmx/ChangeLog.TL
+++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL
@@ -1,6 +1,14 @@
ChangeLog.TL: TeX Live (TL) changes for xdvipdfmx
=================================================
+2012-04-25 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Enable use of MEM_DEBUG, try to avoid mem_debug_check warning.
+ * mem.h: Enable use of MEM_DEBUG.
+ * mem.c: Increase MEM_LINE, avoid C99-ism, add tex-k@tug.org.
+ * dvipdfmx.c (main): Enable mem_debug_check().
+ * spc_pdfm.c (spc_handler_pdfm_stream_with_type): Free fullname.
+
2012-04-21 Khaled Hosny <khaledhosny@eglug.org>
* src/spc_pdfm.c: use kpse to find media.
diff --git a/Build/source/texk/xdvipdfmx/src/dvipdfmx.c b/Build/source/texk/xdvipdfmx/src/dvipdfmx.c
index e6e210213eb..51ead079990 100644
--- a/Build/source/texk/xdvipdfmx/src/dvipdfmx.c
+++ b/Build/source/texk/xdvipdfmx/src/dvipdfmx.c
@@ -964,8 +964,7 @@ main (int argc, char *argv[])
miktex_uninitialize ();
#endif
- if (verbose)
- mem_debug_check();
+ mem_debug_check();
return 0;
}
diff --git a/Build/source/texk/xdvipdfmx/src/mem.c b/Build/source/texk/xdvipdfmx/src/mem.c
index 97e46cdd0d9..0e1ebeea227 100644
--- a/Build/source/texk/xdvipdfmx/src/mem.c
+++ b/Build/source/texk/xdvipdfmx/src/mem.c
@@ -33,7 +33,7 @@
#include "dpxutil.h"
-#define MEM_LINE 128
+#define MEM_LINE 180
static struct ht_table *mem_ht;
static long int mem_event;
@@ -83,9 +83,10 @@ mem_error (void *vp)
void *mem_add(void *ptr, const char *file, const char *function, int line) {
if (ptr && !mem_internal) {
+ char **p;
mem_internal = 1;
mem_str = malloc(MEM_LINE);
- char **p = malloc(sizeof(ptr));
+ p = malloc(sizeof(ptr));
*p = ptr;
snprintf(mem_str, MEM_LINE, "(0x%08lx) %s (%s, %d)"
#ifdef __GNUC__
@@ -137,7 +138,8 @@ void mem_debug_init(void)
void mem_debug_check(void)
{
if (mem_count)
- WARN("%ld memory objects still allocated\n", mem_count);
+ WARN("%ld memory objects still allocated\n"
+ "You may want to report this to tex-k@tug.org\n", mem_count);
}
void *mem_add(void *ptr) {
diff --git a/Build/source/texk/xdvipdfmx/src/mem.h b/Build/source/texk/xdvipdfmx/src/mem.h
index 6380e9e9125..a4d76f8746a 100644
--- a/Build/source/texk/xdvipdfmx/src/mem.h
+++ b/Build/source/texk/xdvipdfmx/src/mem.h
@@ -33,8 +33,6 @@ extern void *renew (void *p, size_t size);
extern void mem_debug_init(void);
extern void mem_debug_check(void);
-#undef MEM_DEBUG
-
#ifdef MEM_DEBUG
extern void *mem_add (void *ptr,
diff --git a/Build/source/texk/xdvipdfmx/src/spc_pdfm.c b/Build/source/texk/xdvipdfmx/src/spc_pdfm.c
index 204d695f8ef..56d3d6efa01 100644
--- a/Build/source/texk/xdvipdfmx/src/spc_pdfm.c
+++ b/Build/source/texk/xdvipdfmx/src/spc_pdfm.c
@@ -1525,6 +1525,7 @@ spc_handler_pdfm_stream_with_type (struct spc_env *spe, struct spc_arg *args, in
fread(work_buffer, sizeof(char), WORK_BUFFER_SIZE, fp)) > 0)
pdf_add_stream(fstream, work_buffer, nb_read);
MFCLOSE(fp);
+ RELEASE(fullname);
break;
case STRING_STREAM:
fstream = pdf_new_stream(STREAM_COMPRESS);