mirror of
https://github.com/samba-team/samba.git
synced 2025-08-04 08:22:08 +03:00
r6834: Fix bug #2703, found by John Antonishek <ant@nist.gov>. Add NULL
guard for disp_fields[0]. Jeremy.
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
11804521f9
commit
ee45f4b17e
@ -250,12 +250,14 @@ static BOOL usergrp_display(char *field, void **values, void *data_area)
|
|||||||
char **disp_fields = (char **) data_area;
|
char **disp_fields = (char **) data_area;
|
||||||
|
|
||||||
if (!field) { /* must be end of record */
|
if (!field) { /* must be end of record */
|
||||||
if (!strchr_m(disp_fields[0], '$')) {
|
if (disp_fields[0]) {
|
||||||
if (disp_fields[1])
|
if (!strchr_m(disp_fields[0], '$')) {
|
||||||
d_printf("%-21.21s %s\n",
|
if (disp_fields[1])
|
||||||
disp_fields[0], disp_fields[1]);
|
d_printf("%-21.21s %s\n",
|
||||||
else
|
disp_fields[0], disp_fields[1]);
|
||||||
d_printf("%s\n", disp_fields[0]);
|
else
|
||||||
|
d_printf("%s\n", disp_fields[0]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
SAFE_FREE(disp_fields[0]);
|
SAFE_FREE(disp_fields[0]);
|
||||||
SAFE_FREE(disp_fields[1]);
|
SAFE_FREE(disp_fields[1]);
|
||||||
|
Reference in New Issue
Block a user