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

diff --combined src/ole.c
index 3aa880567f0104923024fc4273eeb7212e9c7331,819ad33eded3a86271b6507c34d7855cd7e69a55..dbcda42d71335ca8ba4d08bb60c6a3f496e47156
--- 1/src/ole.c
--- 2/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 66346a8b99369f1d77a643e80e5485b414ab918b,6e289243b524c6b1fca3fdb51f86abd0e65c6ac9..fcd8ead52e1e9f22a7e95b48272a33f8785a079b
--- 1/src/substmap.c
--- 2/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 '"':