crypt32: Don't return from a try block.

dc98a727 · Juan Lang · Alexandre Julliard · 5b37fe45 · dc98a727
Commit dc98a727 authored Jul 18, 2006 by Juan Lang Committed by Alexandre Julliard Jul 19, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 25 additions and 20 deletions

encode.c dlls/crypt32/encode.c +25 -20

No files found.
--- a/dlls/crypt32/encode.c
+++ b/dlls/crypt32/encode.c
@@ -945,32 +945,37 @@ static BOOL WINAPI CRYPT_AsnEncodeNameValue(DWORD dwCertEncodingType,
        case CERT_RDN_ANY_TYPE:
            /* explicitly disallowed */
            SetLastError(E_INVALIDARG);
-            return FALSE;
+            ret = FALSE;
+            break;
        default:
            FIXME("String type %ld unimplemented\n", value->dwValueType);
-            return FALSE;
+            ret = FALSE;
        }
-        CRYPT_EncodeLen(encodedLen, NULL, &lenBytes);
+        if (ret)
-        bytesNeeded = 1 + lenBytes + encodedLen;
-        if (!pbEncoded)
-            *pcbEncoded = bytesNeeded;
-        else
        {
-            if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded,
+            CRYPT_EncodeLen(encodedLen, NULL, &lenBytes);
-             pcbEncoded, bytesNeeded)))
+            bytesNeeded = 1 + lenBytes + encodedLen;
+            if (!pbEncoded)
+                *pcbEncoded = bytesNeeded;
+            else
            {
-                if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG)
+                if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara,
-                    pbEncoded = *(BYTE **)pbEncoded;
+                 pbEncoded, pcbEncoded, bytesNeeded)))
-                *pbEncoded++ = tag;
-                CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes);
-                pbEncoded += lenBytes;
-                switch (value->dwValueType)
                {
-                case CERT_RDN_NUMERIC_STRING:
+                    if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG)
-                case CERT_RDN_PRINTABLE_STRING:
+                        pbEncoded = *(BYTE **)pbEncoded;
-                case CERT_RDN_T61_STRING:
+                    *pbEncoded++ = tag;
-                case CERT_RDN_IA5_STRING:
+                    CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes);
-                    memcpy(pbEncoded, value->Value.pbData, value->Value.cbData);
+                    pbEncoded += lenBytes;
+                    switch (value->dwValueType)
+                    {
+                    case CERT_RDN_NUMERIC_STRING:
+                    case CERT_RDN_PRINTABLE_STRING:
+                    case CERT_RDN_T61_STRING:
+                    case CERT_RDN_IA5_STRING:
+                        memcpy(pbEncoded, value->Value.pbData,
+                         value->Value.cbData);
+                    }
                }
            }
        }