--- parser3/src/main/pa_exception.C	2003/02/04 12:08:56	1.43.2.12
+++ parser3/src/main/pa_exception.C	2003/03/07 14:56:59	1.43.2.15
@@ -5,11 +5,12 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_EXCEPTION_C="$Date: 2003/02/04 12:08:56 $";
+static const char* IDENT_EXCEPTION_C="$Date: 2003/03/07 14:56:59 $";
 
 #include "pa_common.h"
 #include "pa_exception.h"
 #include "pa_sapi.h"
+#include "pa_globals.h"
 
 // statics
 
@@ -46,29 +47,25 @@ Exception::Exception(const char* atype,
 	ftype=atype;
 	fproblem_source=aproblem_source;
 
-	char *comment;
 	if(comment_fmt) {
-		comment=new char[MAX_STRING];
+		fcomment=CharPtr(new char[MAX_STRING]);
 		va_list args;
 		va_start(args, comment_fmt);
-		vsnprintf(comment, MAX_STRING, comment_fmt, args);
+		vsnprintf(fcomment, MAX_STRING, comment_fmt, args);
 		va_end(args);
 	} else
-		comment=0;
-
-	fcomment=CharPtr(comment);
+		fcomment=CharPtr(0);
 }
 
 #ifdef XML
 Exception::Exception(
-	const String *aproblem_source, 
+	StringPtr aproblem_source, 
 	GdomeException& exc) :
 	ftype("xml"),
-	fproblem_source(aproblem_source),
-	owns_comment(true) {
+	fproblem_source(aproblem_source) {
 
-	const char* xml_generic_errors=xmlGenericErrors();
-	if(xml_generic_errors || exc) {
+	CharPtr xml_generic_errors=xmlGenericErrors();
+	if(xml_generic_errors.get() || exc) {
 		const char* s;
 		switch((GdomeExceptionCode)exc) {
 		case GDOME_NOEXCEPTION_ERR: s="NOEXCEPTION_ERR"; break;
@@ -91,7 +88,7 @@ Exception::Exception(
 		default: s="<UNKNOWN CODE>"; break;
 		}
 		
-		fcomment=(char *)malloc(MAX_STRING);
+		fcomment=CharPtr(new char[MAX_STRING]);
 		const char* xml_error_message;
 		const char* xml_error_prefix;
 		if(xml_generic_errors) {
@@ -114,10 +111,8 @@ Exception::Exception(
 				"%s", 
 					xml_error_message // xml generic messages accumulated
 			);
-		if(xml_generic_errors)
-			free((void *)xml_generic_errors);
 	} else
-		fcomment=0;
+		fcomment=CharPtr(0);
 }
 #endif