BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.bin / pascal / libpc / DISPOSE.c

diff --git a/usr/src/usr.bin/pascal/libpc/DISPOSE.c b/usr/src/usr.bin/pascal/libpc/DISPOSE.c
index 90a9c43..43ba60d 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/DISPOSE.c
+++ b/usr/src/usr.bin/pascal/libpc/DISPOSE.c
@@ -1,16 +1,50 @@
-/* Copyright (c) 1979 Regents of the University of California */
+/*-
+ * Copyright (c) 1979 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */

 
 

-static char sccsid[] = "@(#)DISPOSE.c 1.1 %G%";
+#ifndef lint
+static char sccsid[] = "@(#)DISPOSE.c  1.4 (Berkeley) 4/9/90";
+#endif /* not lint */

 
 #include       "h00vars.h"
 
 #include       "h00vars.h"

-#include       "h01errs.h"

 
 

-DISPOSE(var, size)
+DISPOSE(var, siz)

        register char   **var;  /* pointer to pointer being deallocated */
        register char   **var;  /* pointer to pointer being deallocated */

-       int             size;   /* sizeof(bletch) */
+       long            siz;    /* sizeof(bletch) */

 {
 {

+       register int size = siz;
+

        if (*var == 0 || *var + size > _maxptr || *var < _minptr) {
        if (*var == 0 || *var + size > _maxptr || *var < _minptr) {

-               ERROR(ENILPTR,0);
+               ERROR("Pointer value out of legal range\n", 0);

                return;
        }
        free(*var);
                return;
        }
        free(*var);