Merge lp:~oif-team/geis/clone-fix into lp:geis

[Chase Douglas]

Fix buffer overflow when cloning filter bags

[Stephen M. Webb (bregma)]

geis_filter_term_bag_new() should take a GeisSize argument instead of unsigned int for consistency.

With that change, I approve.

review: Approve

=== modified file 'libutouch-geis/geis_filter.c'
--- libutouch-geis/geis_filter.c	2011-02-27 21:41:00 +0000
+++ libutouch-geis/geis_filter.c	2011-03-23 16:46:33 +0000
@@ -250,7 +250,7 @@
     goto final_exit;
   }
 
-  filter->terms = geis_filter_term_bag_new();
+  filter->terms = geis_filter_term_bag_new(0);
   if (!filter->terms)
   {
     geis_error_push(geis, GEIS_STATUS_UNKNOWN_ERROR);

=== modified file 'libutouch-geis/geis_filter_term.c'
--- libutouch-geis/geis_filter_term.c	2011-02-27 21:41:00 +0000
+++ libutouch-geis/geis_filter_term.c	2011-03-23 16:46:33 +0000
@@ -54,7 +54,7 @@
 
 
 GeisFilterTermBag
-geis_filter_term_bag_new()
+geis_filter_term_bag_new(unsigned int store_size)
 {
   GeisFilterTermBag bag = calloc(1, sizeof(struct _GeisFilterTermBag));
   if (!bag)
@@ -63,7 +63,7 @@
     goto final_exit;
   }
 
-  bag->store_size = 3;
+  bag->store_size = store_size ? store_size : 3;
   bag->count = 0;
   bag->store = calloc(bag->store_size, sizeof(GeisFilterTerm));
   if (!bag->store)
@@ -88,13 +88,12 @@
 geis_filter_term_bag_clone(GeisFilterTermBag original)
 {
   GeisSize i;
-  GeisFilterTermBag bag = geis_filter_term_bag_new();
+  GeisFilterTermBag bag = geis_filter_term_bag_new(original->store_size);
   if (!bag)
   {
     goto final_exit;
   }
 
-  bag->store_size = original->store_size;
   bag->count = original->count;
   for (i = 0; i < bag->count; ++i)
   {

=== modified file 'libutouch-geis/geis_filter_term.h'
--- libutouch-geis/geis_filter_term.h	2011-02-17 17:40:49 +0000
+++ libutouch-geis/geis_filter_term.h	2011-03-23 16:46:33 +0000
@@ -105,8 +105,11 @@
 
 /**
  * Creates a new, empty filter term bag,
+ *
+ * @param[in] store_size The initial filter store size. A value of 0 will
+ *                       allocate a reasonable default size.
  */
-GeisFilterTermBag geis_filter_term_bag_new();
+GeisFilterTermBag geis_filter_term_bag_new(unsigned int store_size);
 
 /**
  * Creates a new filter term bag by deep-copying an existing filter term bag.