Changeset 436 for libmpc/trunk/mpccut/mpccut.c

Timestamp:

03/07/09 12:42:23 (15 years ago)

Author:

r2d

Message:

mpccut should now be more resilient to errors

File:

• libmpc/trunk/mpccut/mpccut.c (modified) (5 diffs)

libmpc/trunk/mpccut/mpccut.c

@@ -165 +165 @@
 
         while( memcmp(b.key, "AP", 2) != 0 ) {
+                if ((err = mpc_check_key(b.key)) != MPC_STATUS_OK) {
+                        fprintf(stderr, "Error : invalid input stream\n");
+                        goto error;
+                }
                 if (memcmp(b.key, "EI", 2) == 0)
                         copy_data(in_file, i, e.outputFile, b.size + size);
@@ -182 +186 @@
 
         while( start_block != 0 ){
+                if ((err = mpc_check_key(b.key)) != MPC_STATUS_OK) {
+                        fprintf(stderr, "Error : invalid input stream\n");
+                        goto error;
+                }
                 if (memcmp(b.key, "AP", 2) == 0)
                         start_block--;
@@ -193 +201 @@
 
         while( block_num != 0 ){
+                if ((err = mpc_check_key(b.key)) != MPC_STATUS_OK) {
+                        fprintf(stderr, "Error : invalid input stream\n");
+                        goto error;
+                }
                 if (memcmp(b.key, "AP", 2) == 0) {
                         if ((e.block_cnt & ((1 << e.seek_pwr) - 1)) == 0) {
@@ -214 +226 @@
         writeBlock(&e, "SE", MPC_FALSE, 0); // write end of stream block
 
+error:
         fclose ( e.outputFile );
         fclose ( in_file );
@@ -219 +232 @@
         mpc_reader_exit_stdio(&reader);
         mpc_encoder_exit(&e);
+        if (err != MPC_STATUS_OK)
+                remove(argv[optind + 1]);
 
     return err;