From 13c07d99837ca27fb6a12918ba73e84cbb5cfa7c Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 12 Jan 2017 12:02:03 +0000 Subject: [PATCH] [CritFix] Backport PTR_ARRAY_FOREACH fix --- src/libutil/util.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libutil/util.h b/src/libutil/util.h index da10e419ae..2c6c84fe5e 100644 --- a/src/libutil/util.h +++ b/src/libutil/util.h @@ -507,5 +507,6 @@ gpointer rspamd_shmem_xmap (const char *fname, guint mode, */ gdouble rspamd_normalize_probability (gdouble x, gdouble bias); -#define PTR_ARRAY_FOREACH(ar, i, cur) if (ar != NULL) for ((i) = 0, (cur) = g_ptr_array_index((ar), 0); (i) < (ar)->len; (cur) = g_ptr_array_index((ar), (i + 1)), ++(i)) +#define PTR_ARRAY_FOREACH(ar, i, cur) if ((ar) != NULL && (ar)->len > 0) for ((i) = 0; (i) < (ar)->len && (((cur) = g_ptr_array_index((ar), (i))) || 1); ++(i)) + #endif -- 2.47.3