valentineus/0xFFFF
1
Fork 0
Code Releases Activity

image: Fix autoidentify images

Browse Source
This commit is contained in:
Pali Rohár committed 2012-09-22 19:55:14 +02:00
1 parent a072a2cf83
commit 2127e08052
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/image.c
+2 -2
View File
@@ -180,7 +180,7 @@ static int image_append(struct image * image, const char * type, const char * de
image_free(image); image_free(image);
return -1; return -1;
} }
if ( ! noverify && detected_type != image->type ) { if ( ! noverify && detected_type != image->type && detected_type != IMAGE_UNKNOWN ) {
ERROR("Image type mishmash (detected %s, got %s)", image_type_to_string(detected_type), type); ERROR("Image type mishmash (detected %s, got %s)", image_type_to_string(detected_type), type);
image_free(image); image_free(image);
return -1; return -1;
@@ -588,7 +588,7 @@ void image_print_info(struct image * image) {
if ( str2 ) { if ( str2 ) {
printf(", HW revisions: %s\n", str2); printf(", HW revisions: %s\n", str2);
free(str2); free(str2);
} else { } else if ( str ) {
printf("\n"); printf("\n");
} }