From 1e515eb4c5436e387db6a9a72b97080500115f73 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Fri, 15 Feb 2013 16:05:33 +0000 Subject: [PATCH] rxgen: Fix NULL pointer dereference Avoid a NULL pointer dereference if strchr doesn't find any occurence of '*' in the string. Whilst we handle the not found case when inserting a mid string terminator, we don't handle it when restoring the string to its previous value. Reviewed-on: http://gerrit.openafs.org/9158 Reviewed-by: Derrick Brashear Tested-by: BuildBot Reviewed-by: Jeffrey Altman (cherry picked from commit 0d28f8c0cec91d68023795e6ba9c769d60869f9e) Change-Id: I6eb3ec5647153e588c5a80025da2bf2c921469b3 Reviewed-on: http://gerrit.openafs.org/9525 Tested-by: BuildBot Reviewed-by: Derrick Brashear Reviewed-by: Andrew Deason Reviewed-by: Jeffrey Altman Reviewed-by: Stephan Wiesand --- src/rxgen/rpc_parse.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rxgen/rpc_parse.c b/src/rxgen/rpc_parse.c index a19ca5489..8ce005d90 100644 --- a/src/rxgen/rpc_parse.c +++ b/src/rxgen/rpc_parse.c @@ -1424,7 +1424,8 @@ ss_ProcParams_setup(definition * defp, int *somefrees) } f_print(fout, "\t%s %s", plist->pl.param_type, plist->pl.param_name); - *pntr = pres; + if (pntr) + *pntr = pres; } else if (strchr(plist->pl.param_type, '*') == 0) { f_print(fout, "\t%s %s", plist->pl.param_type, plist->pl.param_name); -- 2.39.5