summaryrefslogtreecommitdiffstats
path: root/libass/ass.c
diff options
context:
space:
mode:
authorGrigori Goronzy <greg@kinoho.net>2015-06-08 22:39:08 +0200
committerGrigori Goronzy <greg@kinoho.net>2015-06-08 22:39:08 +0200
commite0bde0b0625f2d398489d9e2f6b9578c11b8c6fb (patch)
tree4c164ce2f3f18af8655909cfc42c54f8136fe11e /libass/ass.c
parentda32da6fbc5b11effaa716aab0a1aacda8a1fe05 (diff)
parentb1680ade5f3aec40562830cdb40156aa34536fdb (diff)
downloadlibass-e0bde0b0625f2d398489d9e2f6b9578c11b8c6fb.tar.bz2
libass-e0bde0b0625f2d398489d9e2f6b9578c11b8c6fb.tar.xz
Merge pull request #181 from grigorig/clang-static-analysis
Fix some issues reported by clang scan-build
Diffstat (limited to 'libass/ass.c')
-rw-r--r--libass/ass.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libass/ass.c b/libass/ass.c
index c9855ea..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");
}
@@ -1229,12 +1228,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;