sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00
Code

r11135: should fix seg fault in addprinter code reported by Marcin. Allocate memory in convert_printer_info() if necessary

Browse Source 
(This used to be commit 7ada5da8e94a08a9a3e488172fa04ce688882299)
This commit is contained in:
Gerald Carter 2005-10-18 02:37:13 +00:00 committed by Gerald (Jerry) Carter
parent aab2f04e02
commit 6f72169c7c
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source3/rpc_server/srv_spoolss_nt.c
View File

@ -1729,20 +1729,29 @@ WERROR _spoolss_open_printer_ex( pipes_struct *p, SPOOL_Q_OPEN_PRINTER_EX *q_u,
static BOOL convert_printer_info(const SPOOL_PRINTER_INFO_LEVEL *uni,
NT_PRINTER_INFO_LEVEL *printer, uint32 level)
{
BOOL ret = True;
BOOL ret;
switch (level) {
case 2:
/* printer->info_2 is already a valid printer */
/* allocate memory if needed. Messy because
convert_printer_info is used to update an existing
printer or build a new one */
if ( !printer->info_2 ) {
printer->info_2 = TALLOC_ZERO_P( printer, NT_PRINTER_INFO_LEVEL_2 );
if ( !printer->info_2 ) {
DEBUG(0,("convert_printer_info: talloc() failed!\n"));
return False;
}
}
ret = uni_2_asc_printer_info_2(uni->info_2, printer->info_2);
printer->info_2->setuptime = time(NULL);
break;
default:
break;
return ret;
}
return ret;
return False;
}
static BOOL convert_printer_driver_info(const SPOOL_PRINTER_DRIVER_INFO_LEVEL *uni,