--- parser3/src/main/pa_string.C	2002/02/22 12:20:27	1.145
+++ parser3/src/main/pa_string.C	2002/03/27 15:30:37	1.149
@@ -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: pa_string.C,v 1.145 2002/02/22 12:20:27 paf Exp $
+	$Id: pa_string.C,v 1.149 2002/03/27 15:30:37 paf Exp $
 */
 
 #include "pcre.h"
@@ -81,7 +81,7 @@ void String::expand() {
 
 String& String::real_append(STRING_APPEND_PARAMS) {
 	if(!last_chunk) // growth stopped [we're appended as string to somebody]
-		throw Exception(0, 0,
+		throw Exception(0,
 			this,
 			"string growth stopped (append cstr)");
 
@@ -131,7 +131,7 @@ String& String::real_append(STRING_APPEN
 
 char String::first_char() const {
 	if(is_empty())
-		throw Exception(0, 0,
+		throw Exception(0,
 			this,
 			"getting first char of empty string");
 
@@ -314,14 +314,14 @@ const Origin& String::origin() const {
 		return empty_origin;
 	}
 	
-	// determining origin by last appended piece
-	// because first one frequently constant. 
+	// determining origin by first piece or last appended piece
+	// because any of them can be constant=without origin: 
 	// ex: ^load[/file] "document_root" + "/file"
 	// when last peice is constant, 
 	// ex: parser_root_auto_path{dynamic} / auto.p{const}
 	// using first piece
-	Origin& last_origin=append_here[-1].item.origin;
-	return last_origin.file ? last_origin : head.rows[0].item.origin;
+	Origin& first_origin=head.rows[0].item.origin;
+	return first_origin.file ? first_origin : append_here[-1].item.origin;
 }
 #endif
 
@@ -473,7 +473,7 @@ bool String::match(
 				   bool *was_global) const { 
 
 	if(regexp.is_empty())
-		throw Exception(0, 0,
+		throw Exception(0,
 			aorigin,
 			"regexp is empty");
 	const char *pattern=regexp.cstr();
@@ -487,14 +487,14 @@ bool String::match(
 		pool().get_source_charset().pcre_tables);
 
 	if(!code)
-		throw Exception(0, 0,
+		throw Exception(0,
 			&regexp.mid(erroffset, regexp.size()),
 			"regular expression syntax error - %s", errptr);
 	
 	int info_substrings=pcre_info(code, 0, 0);
 	if(info_substrings<0) {
 		pcre_free(code);
-		throw Exception(0, 0,
+		throw Exception(0,
 			aorigin,
 			"pcre_info error (%d)", 
 				info_substrings);
@@ -534,7 +534,7 @@ bool String::match(
 
 		if(exec_substrings<0) {
 			pcre_free(code);
-			throw Exception(0, 0,
+			throw Exception(0,
 				aorigin,
 				"regular expression execute error (%d)", 
 					exec_substrings);
@@ -583,7 +583,7 @@ String& String::change_case(Pool& pool,
 		b=0;
 		break;
 	default:
-		throw Exception(0, 0, 
+		throw Exception(0, 
 			this, 
 			"unknown change case kind #%d", 
 				static_cast<int>(kind)); // never
@@ -644,16 +644,14 @@ void String::join_chain(Pool& pool,
 		STRING_PREPARED_FOREACH_ROW(*this, 
 			if(row->item.lang==joined_lang) {
 				memcpy(ptr, row->item.ptr, row->item.size);  ptr+=row->item.size;
-			} else {
-				--row;  ++countdown; // step back from not-ours
-				break;
-			}
+			} else
+				break; // before non-ours
 		);
 		
 		// set pointers after joined piece
 		achunk=chunk;  arow=row;  acountdown=countdown;
 		// & one step back, see String::reconstruct
-		--row;  ++countdown;
+		--arow;  ++acountdown;
 	}
 }
 
@@ -735,7 +733,7 @@ double String::as_double() const {
 		result=(double)strtod(cstr, &error_pos);
 
 	if(*error_pos/*not EOS*/)
-		throw Exception(0, 0,
+		throw Exception("number.format",
 			this,
 			"invalid number (double)");
 
@@ -763,7 +761,7 @@ int String::as_int() const {
 		result=(int)strtol(cstr, &error_pos, 0);
 
 	if(*error_pos/*not EOS*/)
-		throw Exception(0, 0,
+		throw Exception("number.format",
 			this,
 			"invalid number (int)");
 
@@ -804,26 +802,32 @@ void String::serialize(size_t prolog_siz
 		cur+=row->item.size;
 	);
 }
-void String::deserialize(size_t prolog_size, void *buf, size_t buf_size, const char *file) {
+bool String::deserialize(size_t prolog_size, void *buf, size_t buf_size, const char *file) {
 	if(buf_size<=prolog_size)
-		return;
+		return false;
 
 	char *cur=(char *)buf+prolog_size;
 	buf_size-=prolog_size;
 
 	while(buf_size) {
-		uchar lang=*(uchar *)(cur);
-		
+		if(sizeof(uchar)+sizeof(ushort)>buf_size) // lang+size
+			return false;
+
+		uchar lang=*(uchar *)(cur);		
 		ushort size=uchars2ushort(
 			*(uchar*)(cur+sizeof(uchar)*1),
 			*(uchar*)(cur+sizeof(uchar)*2)
 		);
 
+		size_t piece_size=sizeof(uchar)+sizeof(ushort)+size;
+		if(piece_size>buf_size) // buffer overrun, can be on incomplete cache files
+			return false;
+
 		const char *ptr=(const char*)(cur+sizeof(uchar)*3); 
 		APPEND(ptr, size, lang, file, 0);
 
-		size_t piece_size=sizeof(uchar)+sizeof(ushort)+size;
 		cur+=piece_size;
 		buf_size-=piece_size;
 	}
+	return true;
 }