vbox的更動 94404 路徑 trunk/src/libs/openssl-3.0.2/fuzz/asn1.c

時間撮記:

2022-3-31 上午09:00:36 (3 年 以前)

作者:

vboxsync

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

150730

訊息:

libs/openssl: Update to 3.0.2 and switch to it, bugref:10128

位置:

trunk/src/libs/openssl-3.0.2

檔案:

• . (修改) (1 屬性更動)
• fuzz/asn1.c (修改) (5 筆差異)

trunk/src/libs/openssl-3.0.2

@@ -13 +13 @@
 /vendor/openssl/1.1.1k:145841-145843
 /vendor/openssl/3.0.1:150323-150324
-/vendor/openssl/current:147554-150322
+/vendor/openssl/3.0.2:150728-150729
+/vendor/openssl/current:147554-150727

@@ -13 +13 @@
 /vendor/openssl/1.1.1k:145841-145843
 /vendor/openssl/3.0.1:150323-150324
-/vendor/openssl/current:147554-150322
+/vendor/openssl/3.0.2:150728-150729
+/vendor/openssl/current:147554-150727

trunk/src/libs/openssl-3.0.2/fuzz/asn1.c

@@ -1 +1 @@
 /*
- * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License");
@@ -219 +219 @@
         BIO *bio = BIO_new(BIO_s_null()); \
         \
-        PRINT(bio, type); \
-        BIO_free(bio); \
+        if (bio != NULL) { \
+            PRINT(bio, type); \
+            BIO_free(bio); \
+        } \
         len2 = I2D(type, &der); \
         if (len2 != 0) {} \
@@ -236 +238 @@
         BIO *bio = BIO_new(BIO_s_null()); \
         \
-        PRINT(bio, type, 0); \
-        BIO_free(bio); \
+        if (bio != NULL) { \
+            PRINT(bio, type, 0); \
+            BIO_free(bio); \
+        } \
         I2D(type, &der); \
         OPENSSL_free(der); \
@@ -252 +256 @@
         BIO *bio = BIO_new(BIO_s_null()); \
         \
-        PRINT(bio, type, 0, pctx); \
-        BIO_free(bio); \
+        if (bio != NULL) { \
+            PRINT(bio, type, 0, pctx); \
+            BIO_free(bio); \
+        } \
         I2D(type, &der); \
         OPENSSL_free(der); \
@@ -308 +314 @@
         if (o != NULL) {
             BIO *bio = BIO_new(BIO_s_null());
-
-            ASN1_item_print(bio, o, 4, i, pctx);
-            BIO_free(bio);
+            if (bio != NULL) {
+                ASN1_item_print(bio, o, 4, i, pctx);
+                BIO_free(bio);
+            }
             ASN1_item_i2d(o, &der, i);
             OPENSSL_free(der);

@@ -13 +13 @@
 /vendor/openssl/1.1.1k:145841-145843
 /vendor/openssl/3.0.1:150323-150324
-/vendor/openssl/current:147554-150322
+/vendor/openssl/3.0.2:150728-150729
+/vendor/openssl/current:147554-150727