From e3a13c72f6f70f12a314a67da5540691a079d5b7 Mon Sep 17 00:00:00 2001 From: Grigori Goronzy Date: Sun, 7 Jun 2015 21:30:41 +0200 Subject: Fix minor memory leak in ass_read_styles Reported by clang scan-build static analysis. Also fix incorrect return value in case of error. --- libass/ass.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libass/ass.c') diff --git a/libass/ass.c b/libass/ass.c index c9855ea..6e9f2fe 100644 --- a/libass/ass.c +++ b/libass/ass.c @@ -1229,12 +1229,13 @@ int ass_read_styles(ASS_Track *track, char *fname, char *codepage) buf = tmpbuf; } if (!buf) - return 0; + return 1; #endif old_state = track->parser_priv->state; track->parser_priv->state = PST_STYLES; process_text(track, buf); + free(buf); track->parser_priv->state = old_state; return 0; -- cgit v1.2.3 From b1680ade5f3aec40562830cdb40156aa34536fdb Mon Sep 17 00:00:00 2001 From: Grigori Goronzy Date: Sun, 7 Jun 2015 21:48:36 +0200 Subject: Remove several dead stores Reported by clang scan-build static analysis. --- libass/ass.c | 1 - 1 file changed, 1 deletion(-) (limited to 'libass/ass.c') diff --git a/libass/ass.c b/libass/ass.c index 6e9f2fe..69dec8d 100644 --- a/libass/ass.c +++ b/libass/ass.c @@ -1018,7 +1018,6 @@ static char *sub_recode(ASS_Library *library, char *data, size_t size, out: if (icdsc != (iconv_t) (-1)) { (void) iconv_close(icdsc); - icdsc = (iconv_t) (-1); ass_msg(library, MSGL_V, "Closed iconv descriptor"); } -- cgit v1.2.3