sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-10 04:23:50 +03:00
Code Activity

pytdbpack_calc_reqd_len: Correct calculation of packed length of

Browse Source 
string types
This commit is contained in:
Martin Pool
-
parent 20d88a7d1e
commit 30525aee33
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/python/py_tdbpack.c
View File

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