a_mbstr.c

Timestamp:

Sep 4, 2024 11:32:47 AM (6 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

164679

Message:

openssl-3.1.7: Applied and adjusted our OpenSSL changes to 3.1.7. bugref:10757

Location:

trunk/src/libs/openssl-3.1.7

Files:

trunk/src/libs/openssl-3.1.7

Property svn:mergeinfo

-              r104078
+              r105945
 /*
  * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2024 The OpenSSL Project Authors. All Rights Reserved.
+ *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
 …
         free_out = 0;
         dest = *out;
+        OPENSSL_free(dest->data);
+        dest->data = NULL;
+        dest->length = 0;
+        ASN1_STRING_set0(dest, NULL, 0);
         dest->type = str_type;
     } else {
 …
     if (inform == outform) {
         if (!ASN1_STRING_set(dest, in, len)) {
+            if (free_out) {
+                ASN1_STRING_free(dest);
+                *out = NULL;
+            }
             ERR_raise(ERR_LIB_ASN1, ERR_R_MALLOC_FAILURE);
             return -1;
 …
+    }
     if ((p = OPENSSL_malloc(outlen + 1)) == NULL) {
         if (free_out)
+        if (free_out) {
             ASN1_STRING_free(dest);
+            *out = NULL;
+        }
         ERR_raise(ERR_LIB_ASN1, ERR_R_MALLOC_FAILURE);
         return -1;

Note: See TracChangeset for help on using the changeset viewer.