This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via b2c5eaa7e3f80fd1b2f3e45f70790d6440465e8f (commit) via a87bf60f6d8d3d43074195e38fdb352e7fbbb99c (commit) from dbcccdb698055de18b0adb88101bb0d450cb4d43 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/b2c5eaa7e3f80fd1b2f3e45f70790d6440465... commit b2c5eaa7e3f80fd1b2f3e45f70790d6440465e8f Author: Cyril Hrubis <metan@ucw.cz> Date: Sun Aug 26 16:38:09 2012 +0200 loaders: JPG: Fix memleak when saving JPEG image. diff --git a/libs/loaders/GP_JPG.c b/libs/loaders/GP_JPG.c index 2c40f47..fbf57c6 100644 --- a/libs/loaders/GP_JPG.c +++ b/libs/loaders/GP_JPG.c @@ -196,7 +196,6 @@ GP_Context *GP_LoadJPG(const char *src_path, GP_ProgressCallback *callback) if (GP_OpenJPG(src_path, &f)) return NULL; - res = GP_ReadJPG(f, callback); @@ -322,6 +321,7 @@ int GP_SaveJPG(const GP_Context *src, const char *dst_path, if (setjmp(my_err.setjmp_buf)) { err = EIO; + //TODO: is cinfo allocated? goto err2; } @@ -366,11 +366,12 @@ int GP_SaveJPG(const GP_Context *src, const char *dst_path, if (GP_ProgressCallbackReport(callback, y, src->h, src->w)) { GP_DEBUG(1, "Operation aborted"); err = ECANCELED; - goto err2; + goto err3; } } jpeg_finish_compress(&cinfo); + jpeg_destroy_compress(&cinfo); if (fclose(f)) { err = errno; @@ -378,12 +379,12 @@ int GP_SaveJPG(const GP_Context *src, const char *dst_path, dst_path, strerror(errno)); goto err1; } - + GP_ProgressCallbackDone(callback); return 0; -//TODO: is cinfo allocated? -err2: +err3: jpeg_destroy_compress(&cinfo); +err2: fclose(f); err1: unlink(dst_path); http://repo.or.cz/w/gfxprim.git/commit/a87bf60f6d8d3d43074195e38fdb352e7fbbb... commit a87bf60f6d8d3d43074195e38fdb352e7fbbb99c Author: Cyril Hrubis <metan@ucw.cz> Date: Sun Aug 26 16:36:42 2012 +0200 tests: Run loaders testsuite using build/* libraries. diff --git a/tests/loaders/runtest.sh b/tests/loaders/runtest.sh index acd4771..0c6d722 100755 --- a/tests/loaders/runtest.sh +++ b/tests/loaders/runtest.sh @@ -9,4 +9,4 @@ # export LIBC_FATAL_STDERR_=1 -LD_PRELOAD=`pwd`/../framework/libtst_preload.so ./loaders_suite "$@" +LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./loaders_suite "$@" ----------------------------------------------------------------------- Summary of changes: libs/loaders/GP_JPG.c | 11 ++++++----- tests/loaders/runtest.sh | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")