Fix -4 return code when expected BAD_FUNC_ARG(-173)

kaleb-himes · kaleb-himes · commit 4bb6c51d2d55 · 2023-10-05T14:20:37.000-06:00
diff --git a/src/ssl_certman.c b/src/ssl_certman.c
@@ -819,7 +819,11 @@ int wolfSSL_CertManagerVerify(WOLFSSL_CERT_MANAGER* cm, const char* fname,
         WOLFSSL_MSG("Getting dynamic buffer");
         buff = (byte*)XMALLOC((size_t)sz, cm->heap, DYNAMIC_TYPE_FILE);
         if (buff == NULL) {
-            ret = WOLFSSL_BAD_FILE;
+            /* If some other error has already occurred preserve that code
+             * return WOLFSSL_BAD_FILE if that is the only error condition */
+            if (ret == WOLFSSL_SUCCESS) {
+                ret = WOLFSSL_BAD_FILE;
+            }
         }
     }
     /* Read all the file into buffer. */

Original file line number	Diff line number	Diff line change
`@@ -819,7 +819,11 @@ int wolfSSL_CertManagerVerify(WOLFSSL_CERT_MANAGER* cm, const char* fname,`
`819`	`819`	`WOLFSSL_MSG("Getting dynamic buffer");`
`820`	`820`	`buff = (byte*)XMALLOC((size_t)sz, cm->heap, DYNAMIC_TYPE_FILE);`
`821`	`821`	`if (buff == NULL) {`
`822`		`- ret = WOLFSSL_BAD_FILE;`
	`822`	`+ /* If some other error has already occurred preserve that code`
	`823`	`+ * return WOLFSSL_BAD_FILE if that is the only error condition */`
	`824`	`+ if (ret == WOLFSSL_SUCCESS) {`
	`825`	`+ ret = WOLFSSL_BAD_FILE;`
	`826`	`+ }`
`823`	`827`	`}`
`824`	`828`	`}`
`825`	`829`	`/* Read all the file into buffer. */`