From: Rich Salz <rsalz@openssl.org>
Date: Thu, 16 Jun 2016 16:58:57 +0000 (-0400)
Subject: Fix build break.
X-Git-Tag: OpenSSL_1_1_0-pre6~418
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7f96f15bcfabaa4597fcc9529b7a0716f15e55ff;p=oweals%2Fopenssl.git

Fix build break.

Aggregate local initializers are rarely portable (:

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index 98f363ef42..a6b38935a2 100644
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -876,9 +876,13 @@ static int mime_param_cmp(const MIME_PARAM *const *a,
 
 static MIME_HEADER *mime_hdr_find(STACK_OF(MIME_HEADER) *hdrs, const char *name)
 {
-    MIME_HEADER htmp = { (char *)name, NULL }; /* ugly cast but harmless */
+    MIME_HEADER htmp;
     int idx;
 
+    htmp.name = (char *)name;
+    htmp.value = NULL;
+    htmp.params = NULL;
+
     idx = sk_MIME_HEADER_find(hdrs, &htmp);
     if (idx < 0)
         return NULL;
@@ -887,9 +891,11 @@ static MIME_HEADER *mime_hdr_find(STACK_OF(MIME_HEADER) *hdrs, const char *name)
 
 static MIME_PARAM *mime_param_find(MIME_HEADER *hdr, const char *name)
 {
-    MIME_PARAM param = { (char *)name, NULL }; /* ugly cast but harmless */
+    MIME_PARAM param;
     int idx;
 
+    param.param_name = (char *)name;
+    param.param_value = NULL;
     idx = sk_MIME_PARAM_find(hdr->params, &param);
     if (idx < 0)
         return NULL;