diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-09-16 16:57:21 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-09-16 21:09:17 +1000 |
| commit | 83a24ff2efd48b0e192024798695f6cfec9000b5 (patch) | |
| tree | f3c3e9d54a4e5921a9a0310b1454896f7512aa21 /librpc/ndr | |
| parent | 14340a45bef921db19581258838ec2371d4d21e9 (diff) | |
| download | samba-83a24ff2efd48b0e192024798695f6cfec9000b5.tar.gz samba-83a24ff2efd48b0e192024798695f6cfec9000b5.tar.bz2 samba-83a24ff2efd48b0e192024798695f6cfec9000b5.zip | |
pidl: prevent ndr_print_*() dying on NULL pointers
when using ndrdump you can get uninitialised structures containing
pointers. Don't segfault when trying to print them
Diffstat (limited to 'librpc/ndr')
| -rw-r--r-- | librpc/ndr/libndr.h | 1 | ||||
| -rw-r--r-- | librpc/ndr/ndr_basic.c | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h index 9134efa174..5ad05be891 100644 --- a/librpc/ndr/libndr.h +++ b/librpc/ndr/libndr.h @@ -520,6 +520,7 @@ enum ndr_err_code ndr_push_unique_ptr(struct ndr_push *ndr, const void *p); enum ndr_err_code ndr_push_full_ptr(struct ndr_push *ndr, const void *p); enum ndr_err_code ndr_push_ref_ptr(struct ndr_push *ndr); void ndr_print_struct(struct ndr_print *ndr, const char *name, const char *type); +void ndr_print_null(struct ndr_print *ndr); void ndr_print_enum(struct ndr_print *ndr, const char *name, const char *type, const char *val, uint32_t value); void ndr_print_bitmap_flag(struct ndr_print *ndr, size_t size, const char *flag_name, uint32_t flag, uint32_t value); void ndr_print_bitmap_flag(struct ndr_print *ndr, size_t size, const char *flag_name, uint32_t flag, uint32_t value); diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c index 58d4e46e72..c27faa2398 100644 --- a/librpc/ndr/ndr_basic.c +++ b/librpc/ndr/ndr_basic.c @@ -854,6 +854,11 @@ _PUBLIC_ void ndr_print_struct(struct ndr_print *ndr, const char *name, const ch ndr->print(ndr, "%s: struct %s", name, type); } +_PUBLIC_ void ndr_print_null(struct ndr_print *ndr) +{ + ndr->print(ndr, "UNEXPECTED NULL POINTER"); +} + _PUBLIC_ void ndr_print_enum(struct ndr_print *ndr, const char *name, const char *type, const char *val, uint32_t value) { @@ -1005,6 +1010,11 @@ _PUBLIC_ void ndr_print_array_uint8(struct ndr_print *ndr, const char *name, { int i; + if (data == NULL) { + ndr->print(ndr, "%s: ARRAY(%d) : NULL", name, count); + return; + } + if (count <= 600 && (ndr->flags & LIBNDR_PRINT_ARRAY_HEX)) { char s[1202]; for (i=0;i<count;i++) { |