Changeset bad765a in mainline

Timestamp:

2021-11-04T16:29:57Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e3e64f6

Parents:

f05f413

Message:

Fix reading and writing chunk padding

You cannot use riff_read() to read the chunk padding, because it's not
part of the chunk data proper. This fixes libgfxfont's unit test, which
could not read back the TPF it wrote.

Also, it seems prudent to actually write the padding, not just seek
over it. (Might not be a problem but, just in case…)

File:

• uspace/lib/riff/src/chunk.c (modified) (5 diffs)

uspace/lib/riff/src/chunk.c

@@ -146 +146 @@
         long pos;
         long cksize;
+        uint8_t pad;
+        size_t nw;
         errno_t rc;
 
@@ -153 +155 @@
 
         cksize = pos - wchunk->ckstart;
-        if (pos % 2 != 0)
+        if (pos % 2 != 0) {
                 ++pos;
+                pad = 0;
+                nw = fwrite(&pad, 1, sizeof(pad), rw->f);
+                if (nw != sizeof(pad))
+                        return EIO;
+        }
 
         if (fseek(rw->f, wchunk->ckstart - 4, SEEK_SET) < 0)
@@ -476 +483 @@
         uint8_t byte;
         size_t nread;
-        errno_t rc;
 
         ckend = riff_rchunk_get_ndpos(rchunk);
@@ -483 +489 @@
                 /* (Buffered) reading is faster than seeking */
                 while (rchunk->riffr->pos < ckend) {
-                        rc = riff_read(rchunk, &byte, sizeof(byte), &nread);
-                        if (rc != EOK)
-                                return rc;
-
+                        nread = fread(&byte, 1, sizeof(byte), rchunk->riffr->f);
                         if (nread != sizeof(byte))
                                 return EIO;
+
+                        rchunk->riffr->pos += sizeof(byte);
                 }
 
@@ -495 +500 @@
                 if (fseek(rchunk->riffr->f, ckend, SEEK_SET) < 0)
                         return EIO;
+
                 rchunk->riffr->pos = ckend;
         }