don't ever update the checksum of a corrupt image

[rsbs2] / firmware.c

diff --git a/firmware.c b/firmware.c
index 2c9960fa7436ad745160b512977e108db2c3475e..e73d7cc817210913817de5c6cca8d1f1ee031274 100644 (file)
--- a/firmware.c
+++ b/firmware.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <strings.h>
 #include "rsb-crc.h"
-#include "rsb-lz.h"
+#include "extract.h"
 
 #define FINDSTR(addr, str) (!strncmp((char*)addr, str, strlen(str)))
 
@@ -76,13 +76,13 @@ void show_properties(unsigned char *fw, int len)
                        }
 
                        if (prop->right_rw == 0x00 && prop->rw_mask == 0x00) {
-                               printf("(R-) ");
+                               printf("(R-)");
                        } else if (prop->right_rw == 0x01) {
-                               printf("(RW mask: 0x%02x) ", prop->rw_mask);
+                               printf("(RW mask: 0x%02x)", prop->rw_mask);
                        } else {
-                               printf("(UNK 0x%02x 0x%02x) ", prop->right_rw, prop->rw_mask);
+                               printf("(UNK 0x%02x 0x%02x)", prop->right_rw, prop->rw_mask);
                        }
-                       printf("\n");
+                       printf(", length: %d\n", *((unsigned int*)(fw + i - 4)));
                }
        }
 }
@@ -423,6 +423,7 @@ int main(int argc, char **argv)
        ret = check_crc(fw, statbuf.st_size);
        if ((ret != 0) && (!update_crc)) {
                fprintf(stderr,"Checksum incorrect, aborting...\n");
+               exit(1);
        }
 
        if (patch_fw) {
@@ -461,10 +462,24 @@ int main(int argc, char **argv)
        }
 
        if (extract) {
-               search_lz_sections(fw, statbuf.st_size - 4);
+               extract_files(fw, statbuf.st_size - 4);
        }
 
        if (update_crc || patch_fw || patch_bd) {
+               struct file_entry *fent;
+               char *last_name = NULL;
+
+               fent = get_next_file(fw, statbuf.st_size - 4);
+               while (fent != NULL) {
+                       last_name = fent->name;
+                       fent = get_next_file(NULL, 0);
+               }
+
+               if (strcmp(last_name, "pdata")) {
+                       fprintf(stderr, "corrupt firmware image found (pdata is not last entry, aborting!\n");
+                       exit(1);
+               }
+
                ret = rsb_crc2(fw, statbuf.st_size, 0x55335053, &crc);
                if (ret == 4) {
                        *((unsigned int*)(fw + statbuf.st_size - 4)) = crc;