Juan Lang : cryptui: Use add_usage_to_oid correctly.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ba7eebfd624666f35f4c4e95fd9ce8d860830f8a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ba7eebfd624666f35f4c4e95fd...

Author: Juan Lang 
Date:   Mon Feb 11 12:51:04 2013 -0800

cryptui: Use add_usage_to_oid correctly.

Spotted by Marcus Meissner and Coverity.

---

dlls/cryptui/main.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c
index 6481c1f..c3b0a0e 100644
--- a/dlls/cryptui/main.c
+++ b/dlls/cryptui/main.c
@@ -295,7 +295,7 @@ static CERT_ENHKEY_USAGE *convert_usages_str_to_usage(LPSTR usageStr)
         {
             if (comma)
                 *comma = 0;
-            add_oid_to_usage(usage, ptr);
+            usage = add_oid_to_usage(usage, ptr);
         }
     }
     return usage;
@@ -323,7 +323,7 @@ static CERT_ENHKEY_USAGE *create_advanced_filter(void)
                 {
                     PCCRYPT_OID_INFO *ptr;

-                    for (ptr = usages; *ptr; ptr++)
+                    for (ptr = usages; advancedUsage && *ptr; ptr++)
                     {
                         DWORD i;
                         BOOL disabled = FALSE;
@@ -334,7 +334,7 @@ static CERT_ENHKEY_USAGE *create_advanced_filter(void)
                              (*ptr)->pszOID))
                                 disabled = TRUE;
                         if (!disabled)
-                            add_oid_to_usage(advancedUsage,
+                            advancedUsage = add_oid_to_usage(advancedUsage,
                              (LPSTR)(*ptr)->pszOID);
                     }
                     /* The individual strings are pointers to disabledUsagesStr,