From: Victor Wagner <vitus@wagner.pp.ru>
Date: Wed, 27 Apr 2016 12:22:20 +0000 (+0300)
Subject: Merge branch 'master' of http://wagner.pp.ru/git/oss/catdoc
X-Git-Tag: REL_0_95~1^2~2
X-Git-Url: http://www.wagner.pp.ru/gitweb/?p=oss%2Fcatdoc.git;a=commitdiff_plain;h=26ea699acb7f01e0b3431fd6173feb1f09094d8e;hp=4c1c2b85914997dfaab4718b2723bdb5ba2ef779

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

Conflicts:
	src/fileutil.c
---

diff --git a/src/charsets.c b/src/charsets.c
index 5c58c76..e64e24c 100644
--- 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 ce0bdb7..fc8e7f7 100644
--- 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 e131a0d..3aa8805 100644
--- 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;
 				}
 			}