upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-15 02:10:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

2850. [bug] If isc_heap_insert() failed due to memory shortage

Browse source 
the heap would have corrupted entries.

9.8.0, 9.7.1(?), 9.6.2, 9.5.3
(what about 9.4-ESV?)
This commit is contained in:
Tatuya JINMEI 神明達哉 2010-02-04 23:22:05 +00:00
parent e047f16684
commit 139cedabf9
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
2850. [bug] If isc_heap_insert() failed due to memory shortage
the heap would have corrupted entries.
2849. [bug] Don't treat errors from the xml2 library as fatal.
[RT #20945]

12
lib/isc/heap.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: heap.c,v 1.37 2007/10/19 17:15:53 explorer Exp $ */
/* $Id: heap.c,v 1.38 2010/02/04 23:22:05 jinmei Exp $ */
/*! \file
* Heap implementation of priority queues adapted from the following:
@ -186,15 +186,17 @@ sink_down(isc_heap_t *heap, unsigned int i, void *elt) {
isc_result_t
isc_heap_insert(isc_heap_t *heap, void *elt) {
unsigned int i;
unsigned int new_last;
REQUIRE(VALID_HEAP(heap));
i = ++heap->last;
if (heap->last >= heap->size && !resize(heap))
new_last = heap->last + 1;
RUNTIME_CHECK(new_last > 0); /* overflow check */
if (new_last >= heap->size && !resize(heap))
return (ISC_R_NOMEMORY);
heap->last = new_last;
float_up(heap, i, elt);
float_up(heap, new_last, elt);
return (ISC_R_SUCCESS);
}