From: Victor Wagner <vitus@wagner.pp.ru>
Date: Thu, 28 Apr 2016 04:34:58 +0000 (+0300)
Subject: Merge branch 'master' of http://wagner.pp.ru/git/oss/catdoc
X-Git-Tag: REL_0_95~1^2
X-Git-Url: http://www.wagner.pp.ru/gitweb/?p=oss%2Fcatdoc.git;a=commitdiff_plain;h=b7046520d2de550b7ac99599546fe0a5673470e6;hp=-c

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

b7046520d2de550b7ac99599546fe0a5673470e6
diff --combined src/ole.c
index 3aa8805,819ad33..dbcda42
--- a/src/ole.c
+++ b/src/ole.c
@@@ -74,7 -74,6 +74,7 @@@ FILE* ole_init(FILE *f, void *buffer, s
  				ret=fwrite(buffer, 1, bufSize, newfile);
  				if(ret != bufSize) {
  					perror("Can't write to tmp file");
 +					fclose(newfile);
  					return NULL;
  				}
  			}
@@@ -500,8 -499,8 +500,8 @@@ size_t ole_read(void *ptr, size_t size
  		int readbytes;
  		blockNumber++;
  		newoffset = calcFileBlockOffset(e,blockNumber);
- 		if (newoffset != e->file_offset);
- 		fseek(e->file, e->file_offset=newoffset , SEEK_SET);
+ 		if (newoffset != e->file_offset)
+ 			fseek(e->file, e->file_offset=newoffset , SEEK_SET);
  		readbytes=fread(cptr+rread, 1, min(llen-rread, ssize), e->file);
  		rread +=readbytes;
  		e->file_offset +=readbytes;
diff --combined src/substmap.c
index 66346a8,6e28924..fcd8ead
--- a/src/substmap.c
+++ b/src/substmap.c
@@@ -51,8 -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)
@@@ -79,7 -78,7 +79,7 @@@
  		}
  		/* skip space between  code and sequence */
  		for(;*p && isspace(*p);p++);
- 		if (!p) continue;
+ 		if (!*p) continue;
  		switch (*p) {
  			case '\'':
  			case '"':