Fossil SCM
Correct skintxt2config.c to be able to handle 0-byte input files.
Commit
c7c1c4e8b9e49c59322aae7c5a4dc095a7bb768e0357a5c5d594d6384b621a66
Parent
6362a98fa67e1d7…
1 file changed
+1
-1
+1
-1
| --- tools/skintxt2config.c | ||
| +++ tools/skintxt2config.c | ||
| @@ -90,11 +90,11 @@ | ||
| 90 | 90 | err("Malloc failed."); |
| 91 | 91 | rc = ENOMEM; |
| 92 | 92 | goto end; |
| 93 | 93 | } |
| 94 | 94 | zMem[fpos] = 0; |
| 95 | - if((size_t)1 != fread(zMem, (size_t)fpos, 1, f)){ | |
| 95 | + if(fpos && (size_t)1 != fread(zMem, (size_t)fpos, 1, f)){ | |
| 96 | 96 | rc = EIO; |
| 97 | 97 | err("Error #%d reading file %s", rc, zFilename); |
| 98 | 98 | goto end; |
| 99 | 99 | } |
| 100 | 100 | end: |
| 101 | 101 |
| --- tools/skintxt2config.c | |
| +++ tools/skintxt2config.c | |
| @@ -90,11 +90,11 @@ | |
| 90 | err("Malloc failed."); |
| 91 | rc = ENOMEM; |
| 92 | goto end; |
| 93 | } |
| 94 | zMem[fpos] = 0; |
| 95 | if((size_t)1 != fread(zMem, (size_t)fpos, 1, f)){ |
| 96 | rc = EIO; |
| 97 | err("Error #%d reading file %s", rc, zFilename); |
| 98 | goto end; |
| 99 | } |
| 100 | end: |
| 101 |
| --- tools/skintxt2config.c | |
| +++ tools/skintxt2config.c | |
| @@ -90,11 +90,11 @@ | |
| 90 | err("Malloc failed."); |
| 91 | rc = ENOMEM; |
| 92 | goto end; |
| 93 | } |
| 94 | zMem[fpos] = 0; |
| 95 | if(fpos && (size_t)1 != fread(zMem, (size_t)fpos, 1, f)){ |
| 96 | rc = EIO; |
| 97 | err("Error #%d reading file %s", rc, zFilename); |
| 98 | goto end; |
| 99 | } |
| 100 | end: |
| 101 |