From 91ec6f7269bd7a5b73629f38e9779e84a0fb84f2 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 15 Nov 2013 18:38:52 -0500
Subject: Have the OOM handler also count the age the data in a stream buffer

---
 src/or/relay.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/or/relay.c')

diff --git a/src/or/relay.c b/src/or/relay.c
index a193ad8431..042fc18d11 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1998,6 +1998,7 @@ static int
 cell_queues_check_size(void)
 {
   size_t alloc = total_cells_allocated * packed_cell_mem_cost();
+  alloc += buf_get_total_allocation();
   if (alloc >= get_options()->MaxMemInCellQueues) {
     circuits_handle_oom(alloc);
     return 1;
-- 
cgit v1.2.3-54-g00ecf