From ed96d1e748adbbd451093317d2ca5f359b1bcba4 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 27 Sep 2010 12:43:39 +0200 Subject: [PATCH] libsmbconf: parse an empty share as empty share, not as NULL. This fixes a segfault in net conf import: Importing a text file with an empty share resulted in a segfault. Now this creates an empty share in registry config, just as it should. Thanks to Gregor Beck for reporting. (cherry picked from commit 84127dd50420a7d0e8f389d4af15d52fca6cd809) --- lib/smbconf/smbconf_txt.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/smbconf/smbconf_txt.c b/lib/smbconf/smbconf_txt.c index 501382cc5f..fc6fccaf98 100644 --- a/lib/smbconf/smbconf_txt.c +++ b/lib/smbconf/smbconf_txt.c @@ -452,11 +452,7 @@ static WERROR smbconf_txt_get_share(struct smbconf_ctx *ctx, } tmp_service->num_params = count; - if (count > 0) { - *service = talloc_move(mem_ctx, &tmp_service); - } else { - *service = NULL; - } + *service = talloc_move(mem_ctx, &tmp_service); done: talloc_free(tmp_ctx); -- 2.34.1