sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-25 00:23:52 +03:00
Code Activity

r13585: Sorry Gunther, had to revert this. It's got a buffer

Browse Source 
overrun. Spoke to Jerry about the correct fix. Will add
this after.
Jeremy.
This commit is contained in:
Jeremy Allison
2006-02-21 03:08:42 +00:00
committed by Gerald (Jerry) Carter
parent 9732490811
commit 33e13aabd3
3 changed files with 12 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
source/rpc_parse/parse_prs.c
View File

@@ -1332,49 +1332,6 @@ BOOL prs_string_alloc(const char *name, prs_struct *ps, int depth, const char **
return True;
}
/*******************************************************************
Stream a null-terminated string of fixed len.
********************************************************************/
BOOL prs_string_len(const char *name, prs_struct *ps, int depth, char *str, int len)
{
char *q;
int i;
BOOL charmode = True;
q = prs_mem_get(ps, len+1);
if (q == NULL)
return False;
for(i = 0; i < len; i++) {
if (UNMARSHALLING(ps))
str[i] = q[i];
else
q[i] = str[i];
}
/* The terminating null. */
str[i] = '\0';
if (MARSHALLING(ps)) {
q[i] = '\0';
}
ps->data_offset += len+1;
DEBUG(5,("%s%04x %s: ", tab_depth(depth), ps->data_offset, name));
if (charmode) {
print_asc(5, (unsigned char*)str, len);
} else {
for (i = 0; i < len; i++)
DEBUG(5,("%04x ", str[i]));
}
DEBUG(5,("\n"));
return True;
}
/*******************************************************************
prs_uint16 wrapper. Call this and it sets up a pointer to where the
uint16 should be stored, or gets the size if reading.