Changeset 268

Timestamp:

04/16/07 19:37:04 (17 years ago)

Author:

r2d

Message:

Improved decoding robustness

File:

• libmpc/branches/r2d/libmpcdec/mpc_demux.c (modified) (2 diffs)

libmpc/branches/r2d/libmpcdec/mpc_demux.c

@@ -301 +301 @@
                 mpc_demux_fill(d, 11, 0); // max header block size
                 size = mpc_bits_get_block(&d->bits_reader, &b);
-                // FIXME : stop scan if invalid key
                 while( memcmp(b.key, "AP", 2) != 0 ){ // scan all blocks until audio
+                        if (b.key[0] < 65 || b.key[0] > 90 || b.key[1] < 65 || b.key[1] > 90)
+                                return MPC_STATUS_INVALIDSV;
+                        if (b.size > (mpc_uint64_t) DEMUX_BUFFER_SIZE - 11)
+                                return MPC_STATUS_INVALIDSV;
                         mpc_demux_fill(d, 11 + (mpc_uint32_t) b.size, 0);
                         if (memcmp(b.key, "SH", 2) == 0){
@@ -319 +322 @@
                 }
                 d->bits_reader.buff -= size;
-                if (d->si.stream_version == 0) // si no initialized !!!
+                if (d->si.stream_version == 0) // si not initialized !!!
                         return MPC_STATUS_INVALIDSV;
         } else