--- parser3/src/classes/op.C	2002/04/15 13:17:04	1.86
+++ parser3/src/classes/op.C	2002/04/17 12:20:14	1.90
@@ -4,7 +4,7 @@
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: op.C,v 1.86 2002/04/15 13:17:04 paf Exp $
+	$Id: op.C,v 1.90 2002/04/17 12:20:14 paf Exp $
 */
 
 #include "classes.h"
@@ -92,7 +92,7 @@ static void _taint(Request& r, const Str
 	{
 		Value& vbody=params->as_no_junction(params->size()-1, "body must not be code");
 		
-		String result(r.pool());
+		String& result=*new(pool) String(pool);
 		result.append(
 			vbody.as_string(),  // process marking tainted with that lang
 			lang, true);  // force result language to specified
@@ -103,15 +103,19 @@ static void _taint(Request& r, const Str
 static void _process(Request& r, const String& method_name, MethodParams *params) {
 	// calculate pseudo file name of processed chars
 	// would be something like "/some/file(4) process"
-	char place[MAX_STRING];
+	char local_place[MAX_STRING];
 #ifndef NO_STRING_ORIGIN
 	const Origin& origin=method_name.origin();
-	snprintf(place, MAX_STRING, "%s(%d) %s", 
-		origin.file, 1+origin.line,
-		method_name.cstr());
+	size_t place_size=snprintf(local_place, MAX_STRING, "%s(%d) %s", 
+		origin.file?origin.file:"unknown_file", 1+origin.line,
+		method_name.cstr())+1;
 #else
-	strncpy(place, method_name.cstr(), MAX_STRING-1); place[MAX_STRING-1]=0;
-#endif	
+	strncpy(local_place, method_name.cstr(), MAX_STRING-1); place[MAX_STRING-1]=0;
+	size_t place_size=strlen(local_place)+1;
+#endif
+	char *heap_place=(char *)r.malloc(place_size);
+	memcpy(heap_place, local_place, place_size);
+
 
 	VStateless_class& self_class=*r.self->get_class();
 	const Method *main_method;
@@ -130,7 +134,7 @@ static void _process(Request& r, const S
 		// maybe-define new @main
 		r.use_buf(
 			source.cstr(String::UL_UNSPECIFIED, r.connection(0)), 
-			place, 
+			heap_place, 
 			&self_class);
 		
 		// main_method
@@ -541,7 +545,7 @@ VHash& exception2vhash(Pool& pool, const
 		hash.put(*exception_source_part_name, new(pool) VString(source));
 #ifndef NO_STRING_ORIGIN
 		const Origin& origin=source.origin();
-		hash.put(*new(pool) String(pool, "file"), 				
+		hash.put(*new(pool) String(pool, "file", 0, true),
 			new(pool) VString(*new(pool) String(pool, origin.file)));
 		hash.put(*new(pool) String(pool, "lineno"),
 			new(pool) VInt(pool, 1+origin.line));