mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
Merge from HEAD: Fix NULL pointer de-reference in arguments to tdb_pack.
Andrew Bartlet
This commit is contained in:
parent
77ae3360e3
commit
0809670d0f
@ -79,18 +79,18 @@ again:
|
||||
|
||||
/* Pack header */
|
||||
|
||||
len += tdb_pack(buf + len, buflen - len, NULL, "f", msg->printer);
|
||||
len += tdb_pack(buf + len, buflen - len, "f", msg->printer);
|
||||
|
||||
len += tdb_pack(buf + len, buflen - len, NULL, "ddddd",
|
||||
len += tdb_pack(buf + len, buflen - len, "ddddd",
|
||||
msg->type, msg->field, msg->id, msg->len, msg->flags);
|
||||
|
||||
/* Pack data */
|
||||
|
||||
if (msg->len == 0)
|
||||
len += tdb_pack(buf + len, buflen - len, NULL, "dd",
|
||||
len += tdb_pack(buf + len, buflen - len, "dd",
|
||||
msg->notify.value[0], msg->notify.value[1]);
|
||||
else
|
||||
len += tdb_pack(buf + len, buflen - len, NULL, "B",
|
||||
len += tdb_pack(buf + len, buflen - len, "B",
|
||||
msg->len, msg->notify.data);
|
||||
|
||||
if (buflen != len) {
|
||||
|
Loading…
Reference in New Issue
Block a user