sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

a 0 length printer data value is not a memory allocation error; fix CR601

Browse Source
This commit is contained in:
Gerald Carter -
parent 9151cd7d64
commit 47c1709425
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/rpc_server/srv_spoolss_nt.c
View File

@ -2104,8 +2104,16 @@ static WERROR get_printer_dataex( TALLOC_CTX *ctx, NT_PRINTER_INFO_LEVEL *printe
if ( in_size ) {
data_len = (size > in_size) ? in_size : size*sizeof(uint8);
if ( (*data = (uint8 *)talloc_memdup(ctx, regval_data_p(val), data_len)) == NULL )
return WERR_NOMEM;
/* special case for 0 length values */
if ( data_len ) {
if ( (*data = (uint8 *)talloc_memdup(ctx, regval_data_p(val), data_len)) == NULL )
return WERR_NOMEM;
}
else {
if ( (*data = (uint8 *)talloc_zero(ctx, in_size)) == NULL )
return WERR_NOMEM;
}
}
else
*data = NULL;