The branch, master has been updated
via 753b9c6... s3-spoolss: fix fstrings in convert_devicemode()
function.
from 6aef5e5... Fix bug 6546: Avoid accessing buf[-1] if NUL byte comes
from fgets
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 753b9c6d566fafee9724a84fbd91316767c1c7a2
Author: Günther Deschner <g...@samba.org>
Date: Mon Nov 30 18:10:59 2009 +0100
s3-spoolss: fix fstrings in convert_devicemode() function.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/rpc_server/srv_spoolss_nt.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index 8d7973d..d742048 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -1484,8 +1484,11 @@ bool convert_devicemode(const char *printername,
return false;
}
- rpcstr_push(nt_devmode->devicename, devmode->devicename, 31, 0);
- rpcstr_push(nt_devmode->formname, devmode->formname, 31, 0);
+ fstrcpy(nt_devmode->devicename, devmode->devicename);
+ fstrcpy(nt_devmode->formname, devmode->formname);
+
+ nt_devmode->devicename[31] = '\0';
+ nt_devmode->formname[31] = '\0';
nt_devmode->specversion = devmode->specversion;
nt_devmode->driverversion = devmode->driverversion;
--
Samba Shared Repository
