sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-04 16:58:42 +03:00
Code

We don't need the extra null termination - we've

Browse Source 
already got this in the cli_receive_trans calls.
Jeremy.
(This used to be commit 99424bba7bb45b05d970bab4a5e93f2cb636fcbb)
This commit is contained in:
Jeremy Allison 2008-02-08 22:02:00 -08:00
parent 0b583e4329
commit 20d6ebe813
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source3/libsmb/clilist.c
View File

@ -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