Make sure no assertion expression has side effects

rg3 · Jun 6, 2015 · 5f575e3 · 5f575e3
1 parent 49ee4b4
commit 5f575e3
Show file tree

Hide file tree

Showing 8 changed files with 1,417 additions and 482 deletions.
diff --git a/database.c b/database.c
diff --git a/database_test.c b/database_test.c
diff --git a/messages.c b/messages.c
@@ -113,17 +113,18 @@ void init_tokens(struct tokens *t)
 static int tokenize_callout(pcre_callout_block *b)
 {
 	struct tokens *t;
+	int ret;
 
 	t = (struct tokens *)(b->callout_data);
 
 	/* Too many tokens. */
 	if (t->counter >= MAX_TOKENS)
 		return PCRE_ERROR_CALLOUT;
 
-	assert(pcre_copy_substring(b->subject, b->offset_vector,
-				   b->callout_number + 1, b->callout_number,
-				   t->token[t->counter], MESSAGE_BUFFER_SIZE)
-	       >= 0);
+	ret = pcre_copy_substring(b->subject, b->offset_vector,
+				  b->callout_number + 1, b->callout_number,
+				  t->token[t->counter], MESSAGE_BUFFER_SIZE);
+	assert(ret >= 0);
 	t->counter += 1;
 	return 0;
 }