svn commit: samba r6835 - in trunk/source/utils: .
jra at samba.org
jra at samba.org
Mon May 16 22:55:31 GMT 2005
Author: jra
Date: 2005-05-16 22:55:25 +0000 (Mon, 16 May 2005)
New Revision: 6835
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6835
Log:
Fix bug #2703, found by John Antonishek <ant at nist.gov>. Add NULL
guard for disp_fields[0].
Jeremy.
Modified:
trunk/source/utils/net_ads.c
Changeset:
Modified: trunk/source/utils/net_ads.c
===================================================================
--- trunk/source/utils/net_ads.c 2005-05-16 22:54:46 UTC (rev 6834)
+++ trunk/source/utils/net_ads.c 2005-05-16 22:55:25 UTC (rev 6835)
@@ -250,12 +250,14 @@
char **disp_fields = (char **) data_area;
if (!field) { /* must be end of record */
- if (!strchr_m(disp_fields[0], '$')) {
- if (disp_fields[1])
- d_printf("%-21.21s %s\n",
- disp_fields[0], disp_fields[1]);
- else
- d_printf("%s\n", disp_fields[0]);
+ if (disp_fields[0]) {
+ if (!strchr_m(disp_fields[0], '$')) {
+ if (disp_fields[1])
+ d_printf("%-21.21s %s\n",
+ disp_fields[0], disp_fields[1]);
+ else
+ d_printf("%s\n", disp_fields[0]);
+ }
}
SAFE_FREE(disp_fields[0]);
SAFE_FREE(disp_fields[1]);
More information about the samba-cvs
mailing list