--- ray/src/rt/rv2.c	1991/07/19 15:22:02	1.25
+++ ray/src/rt/rv2.c	1991/08/26 12:53:21	1.27
@@ -1,4 +1,4 @@
-/* Copyright (c) 1987 Regents of the University of California */
+/* Copyright (c) 1991 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -472,6 +472,7 @@ register char  *s;
 		break;
 	default:;
 badparam:
+		*sskip(s) = '\0';
 		sprintf(errmsg, "%s: unknown variable", s);
 		error(COMMAND, errmsg);
 		break;
@@ -573,14 +574,18 @@ char  *s;
 	fputresolu(YMAJOR|YDECR, hresolu, vresolu, fp);
 
 	scanline = (COLR *)malloc(hresolu*sizeof(COLR));
-	if (scanline == NULL)
-		error(SYSTEM, "out of memory in writepict");
+	if (scanline == NULL) {
+		error(COMMAND, "not enough memory!");
+		fclose(fp);
+		unlink(fname);
+		return;
+	}
 	for (y = vresolu-1; y >= 0; y--) {
 		getpictcolrs(y, scanline, &ptrunk, hresolu, vresolu);
 		if (fwritecolrs(scanline, hresolu, fp) < 0)
 			break;
 	}
+	free((char *)scanline);
 	if (fclose(fp) < 0)
 		error(COMMAND, "write error");
-	free((char *)scanline);
 }