From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-35872-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 12605 invoked by alias); 23 Jul 2015 09:00:31 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 35872
Received: (qmail 3886 invoked from network); 23 Jul 2015 09:00:29 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI,
	RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=ham
	autolearn_force=no version=3.4.0
X-AuditID: cbfec7f4-f79c56d0000012ee-b1-55b0aacfc095
Date: Thu, 23 Jul 2015 09:50:20 +0100
From: Peter Stephenson <p.stephenson@samsung.com>
To: zsh-workers@zsh.org
Subject: Re: Unmetafy of getsparam()
Message-id: <20150723095020.3f5ed4c5@pwslap01u.europe.root.pri>
In-reply-to: <150719011354.ZM18370@torch.brasslantern.com>
References: <mo6325$r5k$1@ger.gmane.org> <7277.1437023995@thecus.kiddle.eu>
 <mo8f9k$qt2$1@ger.gmane.org> <14646.1437186782@thecus.kiddle.eu>
 <150718101725.ZM3963@torch.brasslantern.com>
 <18322.1437262124@thecus.kiddle.eu>
 <150719011354.ZM18370@torch.brasslantern.com>
Organization: Samsung Cambridge Solution Centre
X-Mailer: Claws Mail 3.7.9 (GTK+ 2.22.0; i386-redhat-linux-gnu)
MIME-version: 1.0
Content-type: text/plain; charset=US-ASCII
Content-transfer-encoding: 7bit
X-Brightmail-Tracker:
 H4sIAAAAAAAAA+NgFjrKLMWRmVeSWpSXmKPExsVy+t/xa7rnV20INejfJWBxsPkhkwOjx6qD
	H5gCGKO4bFJSczLLUov07RK4Mr69Wc5S8I+14tLBdUwNjNtZuhg5OSQETCTm7/vECmGLSVy4
	t56ti5GLQ0hgKaPEq3vfmCCcGUwS/z9fgXK2MUo0H//BDtLCIqAq0fD6JDOIzSZgKDF102xG
	EFtEQFzi7NrzYCuEBVQkWm/cZQKxeQXsJZ7vWg3WyylgJbFtx05WiKGTgTbMeAV2B7+AvsTV
	v5+YIG6yl5h55QwjRLOgxI/J98CGMgtoSWze1sQKYctLbF7zFuwIIQF1iRt3d7NPYBSahaRl
	FpKWWUhaFjAyr2IUTS1NLihOSs811CtOzC0uzUvXS87P3cQICdwvOxgXH7M6xCjAwajEw/vD
	Z0OoEGtiWXFl7iFGCQ5mJRHeK/OBQrwpiZVVqUX58UWlOanFhxilOViUxHnn7nofIiSQnliS
	mp2aWpBaBJNl4uCUamDMWMyVueX+qu9rX2q8byw2yLsd9Wzj6T27dF5Yp+w96P5VNP56AZfb
	8/C4aVcW73rFn5rz/VsYp8CBE/EfvaoXbind+lWne+HMO3kVTju2mGpXtdWtTWScG1pbEmI7
	b8EN903v2nemHF5zYJlOGtO2ENN+1yv3J70SymtrbfibxM98jOvXwa13lFiKMxINtZiLihMB
	r470UVgCAAA=

On Sun, 19 Jul 2015 01:13:54 -0700
Bart Schaefer <schaefer@brasslantern.com> wrote:
> @@ -4020,7 +4029,7 @@ void
>  langsetfn(Param pm, char *x)
>  {
>      strsetfn(pm, x);
> -    setlang(x);
> +    setlang(unmeta(x));
>  }

This is giving me an instant segmentation violation on one system.

I think the best fix is for unmeta() to adopt the behaviour of checking
and returning NULL immediately.

pws

diff --git a/Src/utils.c b/Src/utils.c
index ba90564..0acab88 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -4401,7 +4401,10 @@ unmeta(const char *file_name)
     char *p;
     const char *t;
     int newsz, meta;
-    
+
+    if (!file_name)
+	return NULL;
+
     meta = 0;
     for (t = file_name; *t; t++) {
 	if (*t == Meta)