[packages/squid.git] / squid-2.5.STABLE6-heap_segfault.patch

Index: squid/src/repl/heap/store_repl_heap.c
diff -c squid/src/repl/heap/store_repl_heap.c:1.8.2.1 squid/src/repl/heap/store_repl_heap.c:1.8.2.2
*** squid/src/repl/heap/store_repl_heap.c:1.8.2.1	Sun Jul 21 18:07:17 2002
--- squid/src/repl/heap/store_repl_heap.c	Thu Aug  5 14:23:01 2004
***************
*** 191,196 ****
--- 191,197 ----
      age = heap_peepminkey(heap->heap);
      entry = heap_extractmin(heap->heap);
      if (storeEntryLocked(entry)) {
+ 	storeLockObject(entry);
  	linklistPush(&heap_walker->locked_entries, entry);
  	goto try_again;
      }
***************
*** 220,225 ****
--- 221,227 ----
      while ((entry = linklistShift(&heap_walker->locked_entries))) {
  	heap_node *node = heap_insert(heap->heap, entry);
  	SET_POLICY_NODE(entry, node);
+ 	storeUnlockObject(entry);
      }
      safe_free(walker->_data);
      cbdataFree(walker);
Commit	Line	Data
657376c6	1	Index: squid/src/repl/heap/store_repl_heap.c
	2	diff -c squid/src/repl/heap/store_repl_heap.c:1.8.2.1 squid/src/repl/heap/store_repl_heap.c:1.8.2.2
	3	*** squid/src/repl/heap/store_repl_heap.c:1.8.2.1 Sun Jul 21 18:07:17 2002
	4	--- squid/src/repl/heap/store_repl_heap.c Thu Aug 5 14:23:01 2004
	5	***************
	6	* 191,196 **
	7	--- 191,197 ----
	8	age = heap_peepminkey(heap->heap);
	9	entry = heap_extractmin(heap->heap);
	10	if (storeEntryLocked(entry)) {
	11	+ storeLockObject(entry);
	12	linklistPush(&heap_walker->locked_entries, entry);
	13	goto try_again;
	14	}
	15	***************
	16	* 220,225 **
	17	--- 221,227 ----
	18	while ((entry = linklistShift(&heap_walker->locked_entries))) {
	19	heap_node *node = heap_insert(heap->heap, entry);
	20	SET_POLICY_NODE(entry, node);
	21	+ storeUnlockObject(entry);
	22	}
	23	safe_free(walker->_data);
	24	cbdataFree(walker);