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

diff --git a/src/ole.c b/src/ole.c
index 3aa880567f0104923024fc4273eeb7212e9c7331..dbcda42d71335ca8ba4d08bb60c6a3f496e47156 100644 (file)
--- a/src/ole.c
+++ b/src/ole.c
@@ -500,8 +500,8 @@ size_t ole_read(void *ptr, size_t size, size_t nmemb, FILE *stream) {
                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 --git a/src/substmap.c b/src/substmap.c
index 66346a8b99369f1d77a643e80e5485b414ab918b..fcd8ead52e1e9f22a7e95b48272a33f8785a079b 100644 (file)
--- a/src/substmap.c
+++ b/src/substmap.c
@@ -79,7 +79,7 @@ SUBSTMAP read_substmap(char* filename) {
                }
                /* skip space between  code and sequence */
                for(;*p && isspace(*p);p++);
-               if (!p) continue;
+               if (!*p) continue;
                switch (*p) {
                        case '\'':
                        case '"':