--- parser3/src/main/pa_string.C	2001/12/24 07:25:43	1.133
+++ parser3/src/main/pa_string.C	2001/12/25 09:00:28	1.136
@@ -4,7 +4,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_string.C,v 1.133 2001/12/24 07:25:43 paf Exp $
+	$Id: pa_string.C,v 1.136 2001/12/25 09:00:28 paf Exp $
 */
 
 #include "pcre.h"
@@ -207,7 +207,7 @@ int String::cmp(int& partial, const Stri
 	bool b_break=src.size()==0;
 	if(!(a_break || b_break)) while(true) {
 		if(pos+a_row->item.size > this_offset) {
-			if(lang!=UL_UNSPECIFIED && a_row->item.lang!=lang) 
+			if(lang!=UL_UNSPECIFIED && a_row->item.lang>lang) 
 				return -1; // wrong lang -- bail out
 
 			int size_diff=
@@ -292,7 +292,7 @@ int String::cmp(int& partial, const char
 	bool b_break=b_size==0;
 	if(!(a_break || b_break)) while(true) {
 		if(pos+a_row->item.size > this_offset) {
-			if(lang!=UL_UNSPECIFIED && a_row->item.lang!=lang) 
+			if(lang!=UL_UNSPECIFIED && a_row->item.lang>lang) 
 				return -1; // wrong lang -- bail out
 
 			int size_diff=
@@ -695,7 +695,7 @@ break21:;
 		if(ai==achunk->count) {
 			if(achunk=arow->link) {
 				ai=0;
-				arow=chunk->rows;
+				arow=achunk->rows;
 			}
 		}
 	} else {
@@ -893,6 +893,9 @@ break2:
 	;
 }
 void String::deserialize(size_t prolog_size, void *buf, size_t buf_size, const char *file) {
+	if(buf_size<=prolog_size)
+		return;
+
 	char *cur=(char *)buf+prolog_size;
 	buf_size-=prolog_size;