sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-01 05:47:28 +03:00
Code

pytdbpack_calc_reqd_len: Correct calculation of packed length of

Browse Source 
string types
(This used to be commit 30525aee33237f5b17e1067a96d09b7ee0a516a6)
This commit is contained in:
Martin Pool 2002-11-04 22:29:03 +00:00
parent 859850faf7
commit feb15f90fe
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source3/python/py_tdbpack.c
View File

@ -327,13 +327,12 @@ pytdbpack_calc_reqd_len(char *format_str,
if (!str_obj)
return -1;
item_len = PyString_Size(str_obj);
if (item_len == -1) {
if (!PyString_Check(str_obj) || ((item_len = PyString_Size(str_obj)) == -1)) {
pytdbpack_bad_type(ch, "String", str_obj);
return -1;
}
len += item_len;
len += 1 + item_len;
}
else if (ch == 'B') {
/* length-preceded byte buffer: n bytes, plus a preceding
@ -608,8 +607,12 @@ pytdbpack_pack_data(const char *format_str,
int size;
char *sval;
size = PyString_GET_SIZE(val_obj);
sval = PyString_AS_STRING(val_obj);
size = PySequence_Length(val_obj);
if (size < 0)
return NULL;
sval = PyString_AsString(val_obj);
if (!sval)
return NULL;
pack_bytes(size+1, sval, &packed); /* include nul */
}
else if (ch == 'B') {