[0.2.2] Properly load blobs from boot images with prepended data

Tasssadar · Jan 8, 2015 · 6607d1c · 6607d1c
1 parent abdae88
commit 6607d1c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/include/libbootimg.h b/include/libbootimg.h
@@ -13,8 +13,8 @@ extern "C" {
 #include <stdio.h>
 #include "boot_img_hdr.h"
 
-#define LIBBOOTIMG_VERSION 0x000201 // 0xMMNNPP
-#define LIBBOOTIMG_VERSION_STR "0.2.1"
+#define LIBBOOTIMG_VERSION 0x000202 // 0xMMNNPP
+#define LIBBOOTIMG_VERSION_STR "0.2.2"
 
 /**
  * Enum containing possible blob types in a boot image.
@@ -85,6 +85,7 @@ struct bootimg
 {
     struct boot_img_hdr hdr; /*!< Boot image header */
     struct bootimg_blob blobs[LIBBOOTIMG_BLOB_CNT]; /*!< Blobs packed in the boot image. */
+    int start_offset; /*!< Offset of the boot image structure from the start of the file. Only used when loading blobs from boot.img file. */
 };
 
 /**
@@ -109,7 +110,7 @@ int libbootimg_init_load(struct bootimg *img, const char *path, int load_blob_ma
  * Loads boot_img_hdr from file on disk
  * @param hdr pointer to boot_img_hdr structure
  * @param path path to boot.img to load header from
- * @return zero if successful, negative value from libbootimg_error if failed.
+ * @return positive offset of the header from the start of the file if successful, negative value from libbootimg_error if failed.
  */
 int libbootimg_load_header(struct boot_img_hdr *hdr, const char *path);
 

diff --git a/src/libbootimg.c b/src/libbootimg.c
@@ -116,11 +116,13 @@ int libbootimg_init_load(struct bootimg *img, const char *path, int load_blob_ma
         return res;
     }
 
+    img->start_offset = res;
+
     f = fopen(path, "r");
     if(!f)
         return translate_errnum(errno);
 
-    addr = img->hdr.page_size;
+    addr = img->start_offset + img->hdr.page_size;
 
     for(i = 0; i < LIBBOOTIMG_BLOB_CNT; ++i)
     {
@@ -174,7 +176,7 @@ int libbootimg_load_header(struct boot_img_hdr *hdr, const char *path)
     int res = 0;
     FILE *f;
     size_t i;
-    static const uint32_t known_magic_pos[] = {
+    static const int known_magic_pos[] = {
         0x0,   // default
         0x100, // HTC signed boot images
     };
@@ -191,7 +193,7 @@ int libbootimg_load_header(struct boot_img_hdr *hdr, const char *path)
         {
             if(memcmp(hdr->magic, BOOT_MAGIC, BOOT_MAGIC_SIZE) == 0)
             {
-                res = 0;
+                res = known_magic_pos[i];
                 break;
             }
         }