sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-24 13:57:43 +03:00
Code

s3-spoolss: Fixed memory error in winreg_get_driver.

Browse Source 
The strings in the structure need to be initialized with an empty
string.

Signed-off-by: Günther Deschner <gd@samba.org>
This commit is contained in:
Andreas Schneider 2010-04-28 11:26:08 +02:00 committed by Günther Deschner
parent c95a79aae9
commit 3f0562f4b4
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
source3/rpc_server/srv_spoolss_util.c
View File

@ -30,6 +30,8 @@
#define TOP_LEVEL_CONTROL_FORMS_KEY TOP_LEVEL_CONTROL_KEY "\\Forms"
#define EMPTY_STRING ""
static const char *empty_string_array[1] = { NULL };
#define EMPTY_STRING_ARRAY empty_string_array
#define CHECK_ERROR(result) \
if (W_ERROR_IS_OK(result)) continue; \
@ -3654,11 +3656,42 @@ WERROR winreg_get_driver(TALLOC_CTX *mem_ctx,
}
info8 = talloc_zero(tmp_ctx, struct spoolss_DriverInfo8);
if (!info8) {
if (info8 == NULL) {
result = WERR_NOMEM;
goto done;
}
info8->driver_name = talloc_strdup(info8, driver_name);
if (info8->driver_name == NULL) {
result = WERR_NOMEM;
goto done;
}
info8->architecture = talloc_strdup(info8, architecture);
if (info8->architecture == NULL) {
result = WERR_NOMEM;
goto done;
}
info8->config_file = EMPTY_STRING;
info8->data_file = EMPTY_STRING;
info8->default_datatype = EMPTY_STRING;
info8->driver_path = EMPTY_STRING;
info8->hardware_id = EMPTY_STRING;
info8->help_file = EMPTY_STRING;
info8->inf_path = EMPTY_STRING;
info8->manufacturer_name = EMPTY_STRING;
info8->manufacturer_url = EMPTY_STRING;
info8->monitor_name = EMPTY_STRING;
info8->print_processor = EMPTY_STRING;
info8->provider = EMPTY_STRING;
info8->vendor_setup = EMPTY_STRING;
info8->color_profiles = empty_string_array;
info8->core_driver_dependencies = EMPTY_STRING_ARRAY;
info8->dependent_files = EMPTY_STRING_ARRAY;
info8->previous_names = EMPTY_STRING_ARRAY;
result = WERR_OK;
for (i = 0; i < num_values; i++) {