diff options
author | Andrew Bartlett <abartlet@samba.org> | 2003-02-12 10:57:39 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2003-02-12 10:57:39 +0000 |
commit | 7ceed4213aeecfb4d9308575180fbddec619f98d (patch) | |
tree | fef5ef589efbb8eb9c9c7e16323e617edd84d0aa | |
parent | e63fc878d9006dabfca6571e9f082d66f05ede30 (diff) | |
download | samba-7ceed4213aeecfb4d9308575180fbddec619f98d.tar.gz samba-7ceed4213aeecfb4d9308575180fbddec619f98d.tar.bz2 samba-7ceed4213aeecfb4d9308575180fbddec619f98d.zip |
Merge from HEAD: Fix NULL pointer de-reference in arguments to tdb_pack.
Andrew Bartlet
(This used to be commit 0809670d0f85405c1e58d7317cc7a6ca67c8ad16)
-rw-r--r-- | source3/printing/notify.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/printing/notify.c b/source3/printing/notify.c index feae9c04c1..2df28a9345 100644 --- a/source3/printing/notify.c +++ b/source3/printing/notify.c @@ -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) { |