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

Timestamp:

2020-09-19T18:55:28Z (4 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/rwave.c (modified) (8 diffs)

uspace/lib/riff/src/rwave.c

@@ -255 +255 @@
         }
 
-        rc = riff_ropen(fname, &wr->rr);
+        rc = riff_ropen(fname, &wr->wave, &wr->rr);
         if (rc != EOK) {
                 assert(rc == EIO || rc == ENOMEM);
@@ -261 +261 @@
         }
 
-        rc = riff_rchunk_start(wr->rr, &wr->wave);
-        if (rc != EOK) {
-                assert(rc == EIO);
-                goto error;
-        }
-
-        rc = riff_read_uint32(wr->rr, &form_id);
+        if (wr->wave.ckid != CKID_RIFF) {
+                printf("Not RIFF file\n");
+                rc = ENOMEM;
+                goto error;
+        }
+
+        rc = riff_read_uint32(&wr->wave, &form_id);
         if (rc != EOK) {
                 assert(rc == EIO);
@@ -279 +279 @@
         }
 
-        rc = riff_rchunk_start(wr->rr, &fmt);
+        rc = riff_rchunk_start(&wr->wave, &fmt);
         if (rc != EOK) {
                 assert(rc == EIO);
@@ -291 +291 @@
         }
 
-        rc = riff_rchunk_read(wr->rr, &fmt, &wfmt, sizeof(rwave_fmt_t), &nread);
+        rc = riff_read(&fmt, &wfmt, sizeof(rwave_fmt_t), &nread);
         if (rc != EOK) {
                 printf("error reading fmt chunk\n");
@@ -304 +304 @@
         }
 
-        rc = riff_rchunk_end(wr->rr, &fmt);
+        rc = riff_rchunk_end(&fmt);
         if (rc != EOK) {
                 assert(rc == EIO);
@@ -318 +318 @@
         }
 
-        rc = riff_rchunk_start(wr->rr, &wr->data);
+        rc = riff_rchunk_start(&wr->wave, &wr->data);
         if (rc != EOK) {
                 assert(rc == EIO);
@@ -353 +353 @@
         errno_t rc;
 
-        rc = riff_rchunk_read(wr->rr, &wr->data, buf, bytes, nread);
+        rc = riff_read(&wr->data, buf, bytes, nread);
         if (rc != EOK) {
                 assert(rc == EIO || rc == ELIMIT);
@@ -373 +373 @@
         errno_t rc;
 
-        rc = riff_rchunk_end(wr->rr, &wr->wave);
+        rc = riff_rchunk_end(&wr->wave);
         if (rc != EOK) {
                 assert(rc == EIO);