[Forensics-changes] [yara] 20/135: Fix minor issues in arena.c

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag v3.1.0
in repository yara.

commit cb4d544dc6523c080b4c5835bf7ac0337032c2e7
Author: Victor Manuel Alvarez <vmalvarez at virustotal.com>
Date:   Wed May 14 11:59:51 2014 +0200

    Fix minor issues in arena.c
---
 libyara/arena.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libyara/arena.c b/libyara/arena.c
index 9b8ff30..a55004f 100644
--- a/libyara/arena.c
+++ b/libyara/arena.c
@@ -412,7 +412,7 @@ int yr_arena_coalesce(
 
   while(page != NULL)
   {
-    total_size += page->size;
+    total_size += page->used;
     page = page->next;
   }
 
@@ -541,9 +541,6 @@ int yr_arena_reserve_memory(
     }
     else
     {
-      if (arena->flags & ARENA_FLAGS_FIXED_SIZE)
-        return ERROR_INSUFICIENT_MEMORY;
-
       new_page = _yr_arena_new_page(new_page_size);
 
       if (new_page == NULL)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git