From 3ae2f01fcb1c674d3ac9d28debbdab86e412bf6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Tue, 21 Apr 2009 19:48:14 +0200
Subject: [PATCH] Fixed bug in AGGR_ARR_EPILOGUE() (aka END_AGGREGATE_ARRAY())
that caused the empty array to always be returned if there were no
unaggragated elements on the stack at END_AGGREGATE_ARRAY.
Fixes LysLysKOM 17483127.
Rev: src/array.h:1.83
---
src/array.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/array.h b/src/array.h
index aecea05293..67d90057a9 100644
--- a/src/array.h
+++ b/src/array.h
@@ -2,7 +2,7 @@
|| This file is part of Pike. For copyright information see COPYRIGHT.
|| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
|| for more information.
-|| $Id: array.h,v 1.82 2008/10/01 23:45:05 mast Exp $
+|| $Id: array.h,v 1.83 2009/04/21 17:48:14 grubba Exp $
*/
#ifndef ARRAY_H
@@ -261,7 +261,7 @@ PMOD_EXPORT struct array *implode_array(struct array *a, struct array *b);
#define AGGR_ARR_EPILOGUE(base_sval) do { \
ptrdiff_t diff__ = Pike_sp - base_sval; \
if (!diff__) { \
- if (base_sval[-1].u.array->size) { \
+ if (!base_sval[-1].u.array->size) { \
free_array (base_sval[-1].u.array); \
add_ref (base_sval[-1].u.array = &empty_array); \
} \
--
GitLab