Merge pull request #3352 from AlxCzl/fix-mad-null-deref

iceman1001 · web-flow · commit af7d233198a0 · 2026-06-02T19:11:05.000+02:00
Fix NULL dereference in MAD print_aid_description
diff --git a/client/src/mifare/mad.c b/client/src/mifare/mad.c
@@ -117,6 +117,8 @@ static int print_aid_description(json_t *root, uint16_t aid, char *fmt, bool ver
             continue;
         }
         const char *fmad = mad_json_get_str(data, "mad");
+        if (fmad == NULL)
+            continue;
         char lfmad[strlen(fmad) + 1];
         strcpy(lfmad, fmad);
         str_lower(lfmad);

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,8 @@ static int print_aid_description(json_t root, uint16_t aid, char fmt, bool ver`
`117`	`117`	`continue;`
`118`	`118`	`}`
`119`	`119`	`const char *fmad = mad_json_get_str(data, "mad");`
	`120`	`+ if (fmad == NULL)`
	`121`	`+ continue;`
`120`	`122`	`char lfmad[strlen(fmad) + 1];`
`121`	`123`	`strcpy(lfmad, fmad);`
`122`	`124`	`str_lower(lfmad);`