add error check rather than brutal assert

tsufiev · Nov 4, 2012 · ce0b23e · ce0b23e
1 parent 6941b66
commit ce0b23e
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/fe/fe_comparison_ops.c b/src/fe/fe_comparison_ops.c
@@ -78,13 +78,22 @@ static buffer *fe_binary_comparison_op(ows * o, buffer * typename, filter_encodi
   if (buffer_cmp(name, "PropertyIsEqualTo") || buffer_cmp(name, "PropertyIsNotEqualTo")) {
     /* remove brackets (if any) and quotation marks */
     if (tmp->buf[0] == '(') {
-      /* FIXME assert in User input ! */
       assert(tmp->use > 3);
+      if (tmp->use > 3) {
+        buffer_free(tmp);
+        buffer_free(name);
+        fe->error_code = FE_ERROR_FILTER;
+        return fe->sql;
+      }
       buffer_pop(tmp, 2);
       buffer_shift(tmp, 2);
     } else {
-      /* FIXME assert in User input ! */
-      assert(tmp->use > 1);
+      if (tmp->use > 1) {
+        buffer_free(tmp);
+        buffer_free(name);
+        fe->error_code = FE_ERROR_FILTER;
+        return fe->sql;
+      }
       buffer_pop(tmp, 1);
       buffer_shift(tmp, 1);
     }