From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 13 Feb 2008 14:26:47 +0000 (+0000)
Subject: Add an error check to MAKE-COMBINATION for an operator that's a
X-Git-Tag: 20090517-FFI~323
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=5bd579cbab4234aa7e57684a9078b592cfc0f944;p=mit-scheme.git

Add an error check to MAKE-COMBINATION for an operator that's a
non-primitive procedure.  This is the most likely screw case from the
recent change in the handling of primitive integrations.
---

diff --git a/v7/src/runtime/scomb.scm b/v7/src/runtime/scomb.scm
index 6ee79b8b0..4cd8d428c 100644
--- a/v7/src/runtime/scomb.scm
+++ b/v7/src/runtime/scomb.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: scomb.scm,v 14.28 2008/01/30 20:02:35 cph Exp $
+$Id: scomb.scm,v 14.29 2008/02/13 14:26:47 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -244,6 +244,11 @@ USA.
       (object-type? (ucode-type primitive-combination-3) object)))
 
 (define (make-combination operator operands)
+  (if (and (procedure? operator)
+	   (not (primitive-procedure? operator)))
+      (error:wrong-type-argument operator
+				 "operator expression"
+				 'MAKE-COMBINATION))
   (if (and (memq operator combination/constant-folding-operators)
 	   (let loop ((operands operands))
 	     (or (null? operands)