From 961aa458a664ffda9228a10685641bd2f4e9f405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?= <grubba@grubba.org> Date: Tue, 8 Jul 2008 18:08:21 +0200 Subject: [PATCH] Disable the destructive multiset code. Rev: src/operators.c:1.237 --- src/operators.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/operators.c b/src/operators.c index 94c7ec12b3..9b54ca3859 100644 --- a/src/operators.c +++ b/src/operators.c @@ -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: operators.c,v 1.236 2008/07/08 13:34:53 grubba Exp $ +|| $Id: operators.c,v 1.237 2008/07/08 16:08:21 grubba Exp $ */ #include "global.h" @@ -39,6 +39,15 @@ #define OP_MODULO_BY_ZERO_ERROR(FUNC) \ math_error(FUNC, sp-2, 2, 0, "Modulo by zero.\n") +/* The destructive multiset merge code is broken. + * l->msd gets -1 refs. + * + * Disable it for now. + * /grubba 2008-07-08 + */ +#undef PIKE_MERGE_DESTR_A +#define PIKE_MERGE_DESTR_A 0 + void index_no_free(struct svalue *to,struct svalue *what,struct svalue *ind) { #ifdef PIKE_SECURITY -- GitLab