Check for abiversion before loading plugins ##crash

Author: radare

libr/anal/p/anal_null.c

@@ -23,6 +23,7 @@ RAnalPlugin r_anal_plugin_null = {
 R_API RLibStruct radare_plugin = {
 	.type = R_LIB_TYPE_ANAL,
 	.data = &r_anal_plugin_null,
-	.version = R2_VERSION
+	.version = R2_VERSION,
+	.abiversion = R2_ABIVERSION
 };
 #endif

libr/util/lib.c

@@ -403,8 +403,14 @@ R_API bool r_lib_validate_plugin(RLib *lib, const char *file, RLibStruct *stru)
 		return false;
 	}
 
-	// Check version compatibility
-	if (stru->version && !lib->ignore_version) {
+	// Check ABI compatibility
+	if (stru->abiversion && !lib->ignore_abiversion) {
+		if (stru->abiversion != lib->abiversion) {
+			R_LOG_WARN ("ABI version mismatch: (ABI %d) vs radare2 (ABI %d) for '%s'", stru->abiversion, lib->abiversion, file);
+			return false;
+		}
+	} else if (stru->version && !lib->ignore_version) {
+		// Check version compatibility
 		char *mm0 = major_minor (stru->version);
 		char *mm1 = major_minor (R2_VERSION);
 		bool mismatch = strcmp (mm0, mm1);
@@ -425,14 +431,6 @@ R_API bool r_lib_validate_plugin(RLib *lib, const char *file, RLibStruct *stru)
 		}
 	}
 
-	// Check ABI compatibility
-	if (stru->abiversion && !lib->ignore_abiversion) {
-		if (stru->abiversion != lib->abiversion) {
-			R_LOG_WARN ("ABI version mismatch: (ABI %d) vs radare2 (ABI %d) for '%s'", stru->abiversion, lib->abiversion, file);
-			return false;
-		}
-	}
-
 	return true;
 }