|
|
The branch, v3-3-test has been updated
via 52654119cbf15acf6c4663b171df04e9a2bc26b7 (commit)
from 4617080b6c4b80bee9c5ebe596636229f778fa62 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 52654119cbf15acf6c4663b171df04e9a2bc26b7
Author: Kai Blin <kai@xxxxxxxxx>
Date: Tue Dec 16 13:42:12 2008 -0800
(Fixed) Final part of fix for bug #5953 - smbclient crashes: cli_list_new
segmentation fault (with NAS-BASIC server).
-----------------------------------------------------------------------
Summary of changes:
source/libsmb/clilist.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/clilist.c b/source/libsmb/clilist.c
index cebafc6..1431b80 100644
--- a/source/libsmb/clilist.c
+++ b/source/libsmb/clilist.c
@@ -79,16 +79,17 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx,
p += 27;
p += clistr_align_in(cli, p, 0);
- /* We can safely use +1 here (which is required by OS/2)
- * instead of +2 as the STR_TERMINATE flag below is
+ /* We can safely use len here (which is required by
OS/2)
+ * and the NAS-BASIC server instead of +2 or +1 as the
+ * STR_TERMINATE flag below is
* actually used as the length calculation.
- * The len+2 is merely an upper bound.
+ * The len is merely an upper bound.
* 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) {
+ if (p + len > pdata_end) {
return pdata_end - base;
}
--
Samba Shared Repository
|
|