Merge branch 'master' of http://wagner.pp.ru/git/oss/catdoc

diff --git a/src/charsets.c b/src/charsets.c
index 5c58c7623c5ebd88eaa6b687a7371b9607284b86..e64e24c07a267d13b223d46217a79ff51600d900 100644 (file)
--- a/src/charsets.c
+++ b/src/charsets.c
@@ -99,6 +99,7 @@ uint16_t * 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;

diff --git a/src/fileutil.c b/src/fileutil.c
index ce0bdb7b50d3405b0c4b87b4715c297f8284f4ce..fc8e7f7bae850c9a28b328d1dd1c1f598b9fd616 100644 (file)
--- a/src/fileutil.c
+++ b/src/fileutil.c
@@ -111,7 +111,7 @@ int check_charset(char **filename,const char *charset) {
                        *filename=strdup(charset);
                        free(tmppath);
                        return 1;
-       }
+       } 
        return 0;
 }
 

diff --git a/src/ole.c b/src/ole.c
index 819ad33eded3a86271b6507c34d7855cd7e69a55..dbcda42d71335ca8ba4d08bb60c6a3f496e47156 100644 (file)
--- a/src/ole.c
+++ b/src/ole.c
@@ -74,6 +74,7 @@ FILE* ole_init(FILE *f, void *buffer, size_t bufSize)  {
                                ret=fwrite(buffer, 1, bufSize, newfile);
                                if(ret != bufSize) {
                                        perror("Can't write to tmp file");
+                                       fclose(newfile);
                                        return NULL;
                                }
                        }

diff --git a/src/substmap.c b/src/substmap.c
index 6e289243b524c6b1fca3fdb51f86abd0e65c6ac9..fcd8ead52e1e9f22a7e95b48272a33f8785a079b 100644 (file)
--- a/src/substmap.c
+++ b/src/substmap.c
@@ -51,7 +51,8 @@ SUBSTMAP read_substmap(char* filename) {
        }
        f=fopen(path,"rb");
        if (!f) {
-               perror("catdoc");
+               perror(path);
+               free(map);
                return NULL;
        }
        if (input_buffer)