ext: crypto: mbedtls: Fix uninitialized variable

Andy Gross · galak · commit 3437a1ba58ec · 2019-02-08T15:32:58.000-06:00
This patch fixes an issue with an uninitialized variable in the x509 mbedtls feature. I sent a related patch to the mbedtls project so that this can be fixed in the future. Mbed-TLS/mbedtls#2392 Signed-off-by: Andy Gross <andy.gross@linaro.org>
diff --git a/library/x509_crt.c b/library/x509_crt.c
@@ -2088,15 +2088,13 @@ static int x509_crt_find_parent_in(
             continue;
         }
 
-        break;
-    }
-
-    if( parent != NULL )
-    {
         *r_parent = parent;
         *r_signature_is_good = signature_is_good;
+
+        break;
     }
-    else
+
+    if (parent == NULL)
     {
         *r_parent = fallback_parent;
         *r_signature_is_good = fallback_signature_is_good;

Original file line number	Diff line number	Diff line change
`@@ -2088,15 +2088,13 @@ static int x509_crt_find_parent_in(`
`2088`	`2088`	`continue;`
`2089`	`2089`	`}`
`2090`	`2090`
`2091`		`- break;`
`2092`		`- }`
`2093`		`-`
`2094`		`- if( parent != NULL )`
`2095`		`- {`
`2096`	`2091`	`*r_parent = parent;`
`2097`	`2092`	`*r_signature_is_good = signature_is_good;`
	`2093`	`+`
	`2094`	`+ break;`
`2098`	`2095`	`}`
`2099`		`- else`
	`2096`	`+`
	`2097`	`+ if (parent == NULL)`
`2100`	`2098`	`{`
`2101`	`2099`	`*r_parent = fallback_parent;`
`2102`	`2100`	`*r_signature_is_good = fallback_signature_is_good;`