Changeset 003c413 in mainline for uspace/lib/riff/src/chunk.c

Timestamp:

2020-09-19T18:55:28Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d145ecb

Parents:

0ee3157

Message:

RIFF reader should heed parent chunk bounds when starting child chunk

File:

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

uspace/lib/riff/src/chunk.c

@@ -117 +117 @@
                 return EIO;
 
-        wchunk->ckstart = pos;
+        wchunk->ckstart = pos + 2 * sizeof(uint32_t);
 
         rc = riff_write_uint32(rw, ckid);
@@ -151 +151 @@
                 return EIO;
 
-        cksize = pos - wchunk->ckstart - 8;
-
-        if (fseek(rw->f, wchunk->ckstart + 4, SEEK_SET) < 0)
+        cksize = pos - wchunk->ckstart;
+
+        if (fseek(rw->f, wchunk->ckstart - 4, SEEK_SET) < 0)
                 return EIO;
 
@@ -190 +190 @@
  *
  * @param fname File name
+ * @param riffck Place to store root (RIFF) chunk
  * @param rrr   Place to store pointer to RIFF reader
  *
@@ -195 +196 @@
  *         file..
  */
-errno_t riff_ropen(const char *fname, riffr_t **rrr)
+errno_t riff_ropen(const char *fname, riff_rchunk_t *riffck, riffr_t **rrr)
 {
         riffr_t *rr;
-        errno_t rc;
+        riff_rchunk_t fchunk;
+        long fsize;
+        errno_t rc;
+        int rv;
 
         rr = calloc(1, sizeof(riffr_t));
@@ -211 +215 @@
                 goto error;
         }
+
+        rv = fseek(rr->f, 0, SEEK_END);
+        if (rv < 0) {
+                rc = EIO;
+                goto error;
+        }
+
+        fsize = ftell(rr->f);
+        if (fsize < 0) {
+                rc = EIO;
+                goto error;
+        }
+
+        rv = fseek(rr->f, 0, SEEK_SET);
+        if (rv < 0) {
+                rc = EIO;
+                goto error;
+        }
+
+        fchunk.riffr = rr;
+        fchunk.ckstart = 0;
+        fchunk.cksize = fsize;
+
+        rc = riff_rchunk_start(&fchunk, riffck);
+        if (rc != EOK)
+                goto error;
 
         *rrr = rr;
@@ -237 +267 @@
 /** Read uint32_t from RIFF file.
  *
- * @param rr RIFF reader
+ * @param rchunk RIFF chunk
  * @param v  Place to store value
  * @return EOK on success, EIO on error.
  */
-errno_t riff_read_uint32(riffr_t *rr, uint32_t *v)
+errno_t riff_read_uint32(riff_rchunk_t *rchunk, uint32_t *v)
 {
         uint32_t vle;
-
-        if (fread(&vle, 1, sizeof(vle), rr->f) < sizeof(vle))
-                return EIO;
+        errno_t rc;
+        size_t nread;
+
+        rc = riff_read(rchunk, &vle, sizeof(vle), &nread);
+        if (rc != EOK)
+                return rc;
 
         *v = uint32_t_le2host(vle);
@@ -254 +287 @@
 /** Start reading RIFF chunk.
  *
- * @param rr     RIFF reader
+ * @param parent Parent chunk
  * @param rchunk Pointer to chunk structure to fill in
  *
  * @return EOK on success, EIO on error.
  */
-errno_t riff_rchunk_start(riffr_t *rr, riff_rchunk_t *rchunk)
+errno_t riff_rchunk_start(riff_rchunk_t *parent, riff_rchunk_t *rchunk)
 {
         errno_t rc;
         long pos;
 
-        pos = ftell(rr->f);
+        pos = ftell(parent->riffr->f);
         if (pos < 0) {
                 rc = EIO;
@@ -270 +303 @@
         }
 
-        rchunk->ckstart = pos;
-        rc = riff_read_uint32(rr, &rchunk->ckid);
+        rchunk->riffr = parent->riffr;
+        rchunk->ckstart = pos + 8;
+        rc = riff_read_uint32(parent, &rchunk->ckid);
         if (rc != EOK)
                 goto error;
-        rc = riff_read_uint32(rr, &rchunk->cksize);
+        rc = riff_read_uint32(parent, &rchunk->cksize);
         if (rc != EOK)
                 goto error;
@@ -290 +324 @@
 static long riff_rchunk_get_end(riff_rchunk_t *rchunk)
 {
-        return rchunk->ckstart + 8 + rchunk->cksize;
+        return rchunk->ckstart + rchunk->cksize;
 }
 
@@ -313 +347 @@
  * Seek to the first byte after end of chunk.
  *
- * @param rr     RIFF reader
  * @param rchunk Chunk structure
  * @return EOK on success, EIO on error.
  */
-errno_t riff_rchunk_end(riffr_t *rr, riff_rchunk_t *rchunk)
+errno_t riff_rchunk_end(riff_rchunk_t *rchunk)
 {
         long ckend;
 
         ckend = riff_rchunk_get_ndpos(rchunk);
-        if (fseek(rr->f, ckend, SEEK_SET) < 0)
-                return EIO;
-
+        if (fseek(rchunk->riffr->f, ckend, SEEK_SET) < 0)
+                return EIO;
+
+        rchunk->riffr = NULL;
         return EOK;
 }
@@ -334 +368 @@
  * of bytes read is returned in @a *nbytes (can even be 0).
  *
- * @param rr RIFF reader
- * @param rchunk RIFF chunk
+ * @param rchunk RIFF chunk for reading
  * @param buf Buffer to read to
  * @param bytes Number of bytes to read
@@ -343 +376 @@
  *         EIO on I/O error.
  */
-errno_t riff_rchunk_read(riffr_t *rr, riff_rchunk_t *rchunk, void *buf,
-    size_t bytes, size_t *nread)
+errno_t riff_read(riff_rchunk_t *rchunk, void *buf, size_t bytes,
+    size_t *nread)
 {
         long pos;
@@ -350 +383 @@
         long toread;
 
-        pos = ftell(rr->f);
+        pos = ftell(rchunk->riffr->f);
         if (pos < 0)
                 return EIO;
@@ -364 +397 @@
         }
 
-        *nread = fread(buf, 1, toread, rr->f);
+        *nread = fread(buf, 1, toread, rchunk->riffr->f);
         if (*nread == 0)
                 return EIO;