[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-3022-g8573032
Volker Lendecke
vlendec at samba.org
Thu Jun 26 13:34:22 GMT 2008
The branch, v3-3-test has been updated
via 8573032877317fe1f5c69e9ced5b19a33d8aefb0 (commit)
from 8dd94d448bc5ad067024c56c6ef498bc88a396b2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 8573032877317fe1f5c69e9ced5b19a33d8aefb0
Author: Volker Lendecke <vl at samba.org>
Date: Thu Jun 26 15:32:27 2008 +0200
Fix a segfault in rpcclient adddriver
(cherry picked from commit d4b5a9d67389578f531527b339f6feead62f082d)
-----------------------------------------------------------------------
Summary of changes:
source/rpcclient/cmd_spoolss.c | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpcclient/cmd_spoolss.c b/source/rpcclient/cmd_spoolss.c
index fc4e0eb..0876d82 100644
--- a/source/rpcclient/cmd_spoolss.c
+++ b/source/rpcclient/cmd_spoolss.c
@@ -1219,13 +1219,13 @@ void set_drv_info_3_env (DRIVER_INFO_3 *info, const char *arch)
Needed to handle the empty parameter string denoted by "NULL"
*************************************************************************/
-static char* get_driver_3_param (char* str, const char* delim, UNISTR* dest)
+static char* get_driver_3_param (char* str, const char* delim, UNISTR* dest,
+ char **saveptr)
{
char *ptr;
- char *saveptr;
/* get the next token */
- ptr = strtok_r(str, delim, &saveptr);
+ ptr = strtok_r(str, delim, saveptr);
/* a string of 'NULL' is used to represent an empty
parameter because two consecutive delimiters
@@ -1255,17 +1255,18 @@ static bool init_drv_info_3_members ( TALLOC_CTX *mem_ctx, DRIVER_INFO_3 *info,
char *saveptr = NULL;
/* fill in the UNISTR fields */
- str = get_driver_3_param (args, ":", &info->name);
- str = get_driver_3_param (NULL, ":", &info->driverpath);
- str = get_driver_3_param (NULL, ":", &info->datafile);
- str = get_driver_3_param (NULL, ":", &info->configfile);
- str = get_driver_3_param (NULL, ":", &info->helpfile);
- str = get_driver_3_param (NULL, ":", &info->monitorname);
- str = get_driver_3_param (NULL, ":", &info->defaultdatatype);
+ str = get_driver_3_param (args, ":", &info->name, &saveptr);
+ str = get_driver_3_param (NULL, ":", &info->driverpath, &saveptr);
+ str = get_driver_3_param (NULL, ":", &info->datafile, &saveptr);
+ str = get_driver_3_param (NULL, ":", &info->configfile, &saveptr);
+ str = get_driver_3_param (NULL, ":", &info->helpfile, &saveptr);
+ str = get_driver_3_param (NULL, ":", &info->monitorname, &saveptr);
+ str = get_driver_3_param (NULL, ":", &info->defaultdatatype, &saveptr);
/* <Comma Separated List of Dependent Files> */
- str2 = get_driver_3_param (NULL, ":", NULL); /* save the beginning of the string */
- str = str2;
+ /* save the beginning of the string */
+ str2 = get_driver_3_param (NULL, ":", NULL, &saveptr);
+ str = str2;
/* begin to strip out each filename */
str = strtok_r(str, ",", &saveptr);
--
Samba Shared Repository
More information about the samba-cvs
mailing list