diff options
| author |   sthen <sthen@openbsd.org> | 2015-07-17 17:36:33 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2015-07-17 17:36:33 +0000 |
| commit | 8d8f1862035928337870d1ee9fbe0e23b1032e17 (patch) | |
| tree | b4f8b3fcc405ab0beff4cd0894c773320a250456 /usr.sbin/nsd/udb.c | |
| parent | Convert ssl_parse_serverhello_use_srtp_ext to CBS. (diff) | |
| download | wireguard-openbsd-8d8f1862035928337870d1ee9fbe0e23b1032e17.tar.xz wireguard-openbsd-8d8f1862035928337870d1ee9fbe0e23b1032e17.zip | |
merge conflicts
Diffstat (limited to 'usr.sbin/nsd/udb.c')
| -rw-r--r-- | usr.sbin/nsd/udb.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/nsd/udb.c b/usr.sbin/nsd/udb.c index 49532516a99..6ec17aec0b6 100644 --- a/usr.sbin/nsd/udb.c +++ b/usr.sbin/nsd/udb.c @@ -91,7 +91,8 @@ udb_base_create_fd(const char* fname, int fd, udb_walk_relptr_func walkfunc, udb->fd = fd; udb->ram_size = 1024; udb->ram_mask = (int)udb->ram_size - 1; - udb->ram_hash = (udb_ptr**)xalloc_zero(sizeof(udb_ptr*)*udb->ram_size); + udb->ram_hash = (udb_ptr**)xalloc_array_zero(sizeof(udb_ptr*), + udb->ram_size); if(!udb->ram_hash) { free(udb->fname); free(udb); @@ -432,10 +433,10 @@ void udb_base_link_ptr(udb_base* udb, udb_ptr* ptr) assert(udb_valid_dataptr(udb, ptr->data)); /* must be to whole chunk*/ #endif udb->ram_num++; - if(udb->ram_num == udb->ram_size && udb->ram_size<(size_t)0xefffffff) { + if(udb->ram_num == udb->ram_size && udb->ram_size<(size_t)0x7fffffff) { /* grow the array, if allocation succeeds */ - udb_ptr** newram = (udb_ptr**)xalloc_zero(sizeof(udb_ptr*)* - udb->ram_size*2); + udb_ptr** newram = (udb_ptr**)xalloc_array_zero( + sizeof(udb_ptr*), udb->ram_size*2); if(newram) { grow_ram_hash(udb, newram); } |