Changeset 808 for openssl/trunk/crypto/asn1/a_utctm.c

Timestamp:

Aug 7, 2014, 8:25:37 PM (11 years ago)

Author:

dmik

Message:

openssl: Merge version 1.0.0n from vendor to trunk.

Location:

openssl/trunk

Files:

• . (modified) (1 prop)
• crypto/asn1/a_utctm.c (modified) (3 diffs)

openssl/trunk/crypto/asn1/a_utctm.c ¶

@@ -197 +197 @@
         struct tm data;
         size_t len = 20;
+        int free_s = 0;
 
         if (s == NULL)
+                {
+                free_s = 1;
                 s=M_ASN1_UTCTIME_new();
+                }
         if (s == NULL)
-                return(NULL);
+                goto err;
+
 
         ts=OPENSSL_gmtime(&t, &data);
         if (ts == NULL)
-                return(NULL);
+                goto err;
 
         if (offset_day || offset_sec)
                 { 
                 if (!OPENSSL_gmtime_adj(ts, offset_day, offset_sec))
-                        return NULL;
+                        goto err;
                 }
 
         if((ts->tm_year < 50) || (ts->tm_year >= 150))
-                return NULL;
+                goto err;
 
         p=(char *)s->data;
@@ -223 +228 @@
                         {
                         ASN1err(ASN1_F_ASN1_UTCTIME_ADJ,ERR_R_MALLOC_FAILURE);
-                        return(NULL);
+                        goto err;
                         }
                 if (s->data != NULL)
@@ -238 +243 @@
 #endif
         return(s);
+        err:
+        if (free_s && s)
+                M_ASN1_UTCTIME_free(s);
+        return NULL;
         }