diff options
Diffstat (limited to 'Build/source/texk')
4 files changed, 57 insertions, 3 deletions
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/ChangeLog b/Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/ChangeLog index 0adc22bbaf0..bcac474b580 100644 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/ChangeLog +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/ChangeLog @@ -1,3 +1,9 @@ +2012-04-25 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-02-MEM_DEBUG (new): Try to avoid mem_debug_check warning. + * spc_pdfm.c (spc_handler_pdfm_stream_with_type): Free fullname. + * mem.c: Increase MEM_LINE, avoid C99-ism, add tex-k@tug.org. + 2012-04-21 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-01-texlive (new): Indicate this the TeX Live version. diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/patch-02-MEM_DEBUG b/Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/patch-02-MEM_DEBUG new file mode 100644 index 00000000000..0d1e647aa7e --- /dev/null +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/patch-02-MEM_DEBUG @@ -0,0 +1,45 @@ +diff -ur dvipdfmx-20120420.orig/src/mem.c dvipdfmx-20120420/src/mem.c +--- dvipdfmx-20120420.orig/src/mem.c 2010-04-05 02:34:08.000000000 +0200 ++++ dvipdfmx-20120420/src/mem.c 2012-04-25 17:56:01.000000000 +0200 +@@ -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; +@@ -71,9 +71,10 @@ + + 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__ +@@ -125,7 +126,8 @@ + 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 -ur dvipdfmx-20120420.orig/src/spc_pdfm.c dvipdfmx-20120420/src/spc_pdfm.c +--- dvipdfmx-20120420.orig/src/spc_pdfm.c 2012-04-20 01:54:05.000000000 +0200 ++++ dvipdfmx-20120420/src/spc_pdfm.c 2012-04-25 17:33:56.000000000 +0200 +@@ -1420,6 +1420,7 @@ + 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); diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/mem.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/mem.c index 078bc2fa619..de5138904fd 100644 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/mem.c +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/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; @@ -71,9 +71,10 @@ void mem_debug_check(void) 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__ @@ -125,7 +126,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/dvipdfmx/dvipdfmx-20120420/src/spc_pdfm.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_pdfm.c index a44db04bc86..4eb32b5a9ac 100644 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_pdfm.c +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_pdfm.c @@ -1420,6 +1420,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); |