[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2055-g101f194

Jeremy Allison jra at samba.org
Sat Feb 9 02:45:10 GMT 2008


The branch, v3-2-test has been updated
       via  101f194795f87c709abfdfbcde710131a88f9d20 (commit)
      from  5e60852bae61be72dee9d5b93c59ac900aba73ae (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 101f194795f87c709abfdfbcde710131a88f9d20
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Feb 8 18:44:33 2008 -0800

    From kukks - prevent crashes if finfo.name == NULL.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/libsmb/clilist.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/clilist.c b/source/libsmb/clilist.c
index 2bad3e5..2b5e751 100644
--- a/source/libsmb/clilist.c
+++ b/source/libsmb/clilist.c
@@ -377,6 +377,12 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute,
 							&resume_key,
 							&last_name_raw);
 
+			if (!finfo.name) {
+				DEBUG(0,("cli_list_new: Error: unable to parse name from info level %d\n",
+					info_level));
+				ff_eos = 1;
+				break;
+			}
 			if (!First && *mask && strcsequal(finfo.name, mask)) {
 				DEBUG(0,("Error: Looping in FIND_NEXT as name %s has already been seen?\n",
 					finfo.name));
@@ -442,6 +448,11 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute,
 							&finfo,
 							NULL,
 							NULL);
+			if (!finfo.name) {
+				DEBUG(0,("cli_list_new: unable to parse name from info level %d\n",
+					info_level));
+				break;
+			}
                         fn(mnt,&finfo, Mask, state);
                 }
         }


-- 
Samba Shared Repository


More information about the samba-cvs mailing list