From fba393bc85e28f517aefa9c0c18608a2bf58937b Mon Sep 17 00:00:00 2001
From: Pavel Reichl <preichl@redhat.com>
Date: Sun, 26 Jan 2014 12:39:43 +0000
Subject: utils: handling NULL params in sss_parse_name

Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
---
 src/util/usertools.c | 54 ++++++++++++++++++++++++++++------------------------
 src/util/util.h      |  2 +-
 2 files changed, 30 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/util/usertools.c b/src/util/usertools.c
index 9edae41e0..fab0a261e 100644
--- a/src/util/usertools.c
+++ b/src/util/usertools.c
@@ -322,7 +322,7 @@ done:
 
 int sss_parse_name(TALLOC_CTX *memctx,
                    struct sss_names_ctx *snctx,
-                   const char *orig, char **domain, char **name)
+                   const char *orig, char **_domain, char **_name)
 {
     pcre *re = snctx->re;
     const char *result;
@@ -346,31 +346,35 @@ int sss_parse_name(TALLOC_CTX *memctx,
 
     strnum = ret;
 
-    result = NULL;
-    ret = pcre_get_named_substring(re, orig, ovec, strnum, "name", &result);
-    if (ret < 0  || !result) {
-        DEBUG(2, ("Name not found!\n"));
-        return EINVAL;
-    }
-    *name = talloc_strdup(memctx, result);
-    pcre_free_substring(result);
-    if (!*name) return ENOMEM;
-
-
-    result = NULL;
-    ret = pcre_get_named_substring(re, orig, ovec, strnum, "domain", &result);
-    if (ret < 0  || !result) {
-        DEBUG(4, ("Domain not provided!\n"));
-        *domain = NULL;
-    } else {
-        /* ignore "" string */
-        if (*result) {
-            *domain = talloc_strdup(memctx, result);
-            pcre_free_substring(result);
-            if (!*domain) return ENOMEM;
+    if (_name != NULL) {
+        result = NULL;
+        ret = pcre_get_named_substring(re, orig, ovec, strnum, "name", &result);
+        if (ret < 0  || !result) {
+            DEBUG(2, ("Name not found!\n"));
+            return EINVAL;
+        }
+        *_name = talloc_strdup(memctx, result);
+        pcre_free_substring(result);
+        if (!*_name) return ENOMEM;
+    }
+
+    if (_domain != NULL) {
+        result = NULL;
+        ret = pcre_get_named_substring(re, orig, ovec, strnum, "domain",
+                                       &result);
+        if (ret < 0  || !result) {
+            DEBUG(4, ("Domain not provided!\n"));
+            *_domain = NULL;
         } else {
-            pcre_free_substring(result);
-            *domain = NULL;
+            /* ignore "" string */
+            if (*result) {
+                *_domain = talloc_strdup(memctx, result);
+                pcre_free_substring(result);
+                if (!*_domain) return ENOMEM;
+            } else {
+                pcre_free_substring(result);
+                *_domain = NULL;
+            }
         }
     }
 
diff --git a/src/util/util.h b/src/util/util.h
index 3334476ab..7b185bcb4 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -349,7 +349,7 @@ int sss_names_init(TALLOC_CTX *mem_ctx,
 
 int sss_parse_name(TALLOC_CTX *memctx,
                    struct sss_names_ctx *snctx,
-                   const char *orig, char **domain, char **name);
+                   const char *orig, char **_domain, char **_name);
 
 char *
 sss_get_cased_name(TALLOC_CTX *mem_ctx, const char *orig_name,
-- 
cgit