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://wagner.pp.ru/gitweb/?a=commitdiff_plain;h=26ea699acb7f01e0b3431fd6173feb1f09094d8e;p=oss%2Fcatdoc.git

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

Conflicts:
	src/fileutil.c
---

26ea699acb7f01e0b3431fd6173feb1f09094d8e
diff --cc src/fileutil.c
index 5ae039f,ce0bdb7..fc8e7f7
--- a/src/fileutil.c
+++ b/src/fileutil.c
@@@ -111,10 -111,7 +111,7 @@@ int check_charset(char **filename,cons
  			*filename=strdup(charset);
  			free(tmppath);
  			return 1;
- 		} else {
- 			free(tmppath);
- 		}
--	}
++	} 
  	return 0;
  }