Fix resource leaks found by cppcheck

[oss/catdoc.git] / src / charsets.c

diff --git a/src/charsets.c b/src/charsets.c
index a81ceebe1a1bb6f8f7e1d38a1379a8c85e7fac77..05118767815072f301bee1cd0f202d3249d55079 100644 (file)
--- a/src/charsets.c
+++ b/src/charsets.c
@@ -14,7 +14,7 @@
 
 char *charset_path=CHARSETPATH;
 char *source_csname=SOURCE_CHARSET, *dest_csname=TARGET_CHARSET;
-short int * source_charset;
+uint16_t * source_charset;
 int unknown_as_hex=0;
 char bad_char[]=UNKNOWN_CHAR;
 CHARSET target_charset;
@@ -99,6 +99,7 @@ short int * read_charset(const char *filename) {
                        if (c<0||c>255||uc<0||(uc>0xFEFE&& uc!=0xFFFE)) {
                                fprintf(stderr,"Invalid charset file %s\n",path);
                                fclose(f);
+                               free(new);
                                return NULL;
                        }
                        new[c]=uc;