Merge pull request #4 from shlyakpavel/patch-2

Fix memory leaks in convert.c
This commit is contained in:
Fred Kiefer 2019-01-01 14:58:03 +01:00 committed by GitHub
commit 059f42a869
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions

View file

@ -1,3 +1,7 @@
2018-12-31 Pavel Shlyak <pvshlyak@edu.hse.ru>
* Source/x11/convert.c: Don't leak memory on error handling
2018-12-02 Fred Kiefer <FredKiefer@gmx.de>
* Source/gsc/GSGState.m (-setColor:state:): Don't copy values onto themselves.

View file

@ -351,6 +351,8 @@ image2TrueColor(RContext *ctx, RImage *image)
if (!err || !nerr) {
if (nerr)
free(nerr);
if (err)
free(err);
RErrorCode = RERR_NOMEMORY;
RDestroyXImage(ctx, ximg);
return NULL;
@ -522,6 +524,8 @@ image2PseudoColor(RContext *ctx, RImage *image)
if (!err || !nerr) {
if (nerr)
free(nerr);
if (err)
free(err);
RErrorCode = RERR_NOMEMORY;
RDestroyXImage(ctx, ximg);
return NULL;
@ -757,6 +761,8 @@ image2GrayScale(RContext *ctx, RImage *image)
if (!gerr || !ngerr) {
if (ngerr)
free(ngerr);
if (gerr)
free(gerr);
RErrorCode = RERR_NOMEMORY;
RDestroyXImage(ctx, ximg);
return NULL;