--- parser3/src/main/pa_exception.C	2002/02/08 07:27:47	1.37
+++ parser3/src/main/pa_exception.C	2003/03/17 14:48:06	1.43.4.1
@@ -1,32 +1,35 @@
 /** @file
 	Parser: exception class.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_exception.C,v 1.37 2002/02/08 07:27:47 paf Exp $
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
+static const char* IDENT_EXCEPTION_C="$Date: 2003/03/17 14:48:06 $";
+
 #include "pa_common.h"
 #include "pa_exception.h"
 #include "pa_globals.h"
+#include "pa_sapi.h"
 
 Exception::Exception() {
-	ftype=fcode=fproblem_source=0;
+	ftype=0;
+	fproblem_source=0;
 	owns_comment=false; fcomment=0;
 }
-Exception::Exception(const String *atype, const String *acode,
+Exception::Exception(const char *atype, 
 					  const String *aproblem_source, 
 					  const char *comment_fmt, ...) {
 	//_asm int 3;
 //__asm__("int3");
 	ftype=atype;
-	fcode=acode;
 	fproblem_source=aproblem_source;
 	owns_comment=true;
 
 	if(comment_fmt) {
-		fcomment=(char *)malloc(MAX_STRING);
+		fcomment=(char *)::malloc(MAX_STRING);
+		if(!fcomment)
+			SAPI::die("out of memory in 'Exception::Exception', failed to allocated %u bytes", MAX_STRING);
 		va_list args;
 		va_start(args, comment_fmt);
 		vsnprintf(fcomment, MAX_STRING, comment_fmt, args);
@@ -36,7 +39,6 @@ Exception::Exception(const String *atype
 }
 Exception::Exception(const Exception& src) : 
 	ftype(src.ftype),
-	fcode(src.fcode),
 	fproblem_source(src.fproblem_source),
 	fcomment(src.fcomment),
 	owns_comment(src.owns_comment) {
@@ -45,7 +47,6 @@ Exception::Exception(const Exception& sr
 }
 Exception& Exception::operator =(const Exception& src) {
 	ftype=src.ftype;
-	fcode=src.fcode;
 	fproblem_source=src.fproblem_source;
 
 	if(owns_comment)
@@ -58,16 +59,14 @@ Exception& Exception::operator =(const E
 }
 Exception::~Exception() {
 	if(owns_comment)
-		free(fcomment);
+		::free(fcomment);
 }
 
 #ifdef XML
 Exception::Exception(
-	const String *atype, const String *acode,
 	const String *aproblem_source, 
 	GdomeException& exc) :
-	ftype(atype),
-	fcode(acode),
+	ftype("xml"),
 	fproblem_source(aproblem_source),
 	owns_comment(true) {
 
@@ -95,7 +94,7 @@ Exception::Exception(
 		default: s="<UNKNOWN CODE>"; break;
 		}
 		
-		fcomment=(char *)malloc(MAX_STRING);
+		fcomment=(char *)::malloc(MAX_STRING);
 		const char *xml_error_message;
 		const char *xml_error_prefix;
 		if(xml_generic_errors) {