[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2057-g99424bb

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  99424bba7bb45b05d970bab4a5e93f2cb636fcbb (commit)
      from  2e27309401faa554620886b0e369db9d9c08e4fd (commit)

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


- Log -----------------------------------------------------------------
commit 99424bba7bb45b05d970bab4a5e93f2cb636fcbb
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Feb 8 22:02:00 2008 -0800

    We don't need the extra null termination - we've
    already got this in the cli_receive_trans calls.
    Jeremy.

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

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


Changeset truncated at 500 lines:

diff --git a/source/libsmb/clilist.c b/source/libsmb/clilist.c
index d913096..e1b1615 100644
--- a/source/libsmb/clilist.c
+++ b/source/libsmb/clilist.c
@@ -83,20 +83,15 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx,
 			 * instead of +2 as the STR_TERMINATE flag below is
 			 * actually used as the length calculation.
 			 * The len+2 is merely an upper bound.
-			 * We ensure we don't get a one byte overread by
-			 * doing a zero termination at pdata_end[-1];
-			 * JRA + kukks */
+			 * Due to the explicit 2 byte null termination
+			 * in cli_receive_trans/cli_receive_nt_trans
+			 * we know this is safe. JRA + kukks
+			 */
 
 			if (p + len + 1 > pdata_end) {
 				return pdata_end - base;
 			}
 
-			/* Ensure the null termination (see above). */
-			{
-				char *pend = CONST_DISCARD(char *, pdata_end);
-				pend[-1] = '\0';
-			}
-
 			/* the len+2 below looks strange but it is
 			   important to cope with the differences
 			   between win2000 and win9x for this call


-- 
Samba Shared Repository