From d02fc74aba847ca34675c21ba1798bbc38ec7b2f Mon Sep 17 00:00:00 2001
From: "Mirar (Pontus Hagland)" <pike@sort.mirar.org>
Date: Sun, 25 Jan 1998 11:13:49 +0100
Subject: [PATCH] (severe bug)-fix (popped args, used args, in that order)
Rev: src/modules/Image/operator.c:1.13
---
src/modules/Image/operator.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/modules/Image/operator.c b/src/modules/Image/operator.c
index 91bf004370..6b9a2bb365 100644
--- a/src/modules/Image/operator.c
+++ b/src/modules/Image/operator.c
@@ -1,9 +1,9 @@
-/* $Id: operator.c,v 1.12 1998/01/24 17:30:58 per Exp $ */
+/* $Id: operator.c,v 1.13 1998/01/25 10:13:49 mirar Exp $ */
/*
**! module Image
**! note
-**! $Id: operator.c,v 1.12 1998/01/24 17:30:58 per Exp $
+**! $Id: operator.c,v 1.13 1998/01/25 10:13:49 mirar Exp $
**! class image
*/
@@ -80,9 +80,6 @@ extern struct program *image_program;
img=(struct image*)o->storage; \
if (!img->img) { free_object(o); error("out of memory\n"); } \
\
- pop_n_elems(args); \
- push_object(o); \
- \
s1=THIS->img; \
if (oper) s2=oper->img; else s2=NULL; \
d=img->img; \
@@ -129,6 +126,8 @@ STANDARD_OPERATOR_HEADER("`-")
s1++; d++;
}
THREADS_DISALLOW();
+ pop_n_elems(args);
+ push_object(o);
}
/*
@@ -167,6 +166,8 @@ STANDARD_OPERATOR_HEADER("`+")
s1++; d++;
}
THREADS_DISALLOW();
+ pop_n_elems(args);
+ push_object(o);
}
/*
@@ -213,6 +214,8 @@ STANDARD_OPERATOR_HEADER("`*")
s1++; d++;
}
THREADS_DISALLOW();
+ pop_n_elems(args);
+ push_object(o);
}
/*
@@ -253,6 +256,8 @@ STANDARD_OPERATOR_HEADER("`| 'maximum'")
s1++; s2++; d++;
}
THREADS_DISALLOW();
+ pop_n_elems(args);
+ push_object(o);
}
/*
@@ -293,6 +298,8 @@ STANDARD_OPERATOR_HEADER("`& 'minimum'")
s1++; d++;
}
THREADS_DISALLOW();
+ pop_n_elems(args);
+ push_object(o);
}
--
GitLab