X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffilexml.C;h=f474317853562554b3a36b9429adc3352ff90bc3;hb=853407b57330e275b6c58432c678159b2eac00db;hp=aef297e41adf822d9c697cda88a7cdb05130dbe0;hpb=36bd2d2bbbe534bf04307149bf6162a70c088656;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/filexml.C b/cinelerra-5.1/cinelerra/filexml.C
index aef297e4..f4743178 100644
--- a/cinelerra-5.1/cinelerra/filexml.C
+++ b/cinelerra-5.1/cinelerra/filexml.C
@@ -58,7 +58,7 @@ XMLBuffer::XMLBuffer(const char *buf, long buf_size, int del)
 	destroy = del;
 }
 
-XMLBuffer::XMLBuffer(long buf_size, const char *buf, int del)
+XMLBuffer::XMLBuffer(long buf_size, char *buf, int del)
 {	// writing
 	bfr = (unsigned char *)buf;
 	bsz = buf_size;
@@ -73,9 +73,10 @@ XMLBuffer::~XMLBuffer()
 	if( destroy ) delete [] bfr;
 }
 
-unsigned char *&XMLBuffer::demand(long len)
+int XMLBuffer::demand(long len)
 {
 	if( len > bsz ) {
+		if( !destroy ) return 0;
 		long sz = inp-bfr;
 		len += sz/2 + BCTEXTLEN;
 		unsigned char *np = new unsigned char[len];
@@ -85,13 +86,13 @@ unsigned char *&XMLBuffer::demand(long len)
 		lmt = np + len;  bsz = len;
 		delete [] bfr;   bfr = np;
 	}
-	return bfr;
+	return 1;
 }
 
 int XMLBuffer::write(const char *bp, int len)
 {
-	if( !destroy && lmt-inp < len ) len = lmt-inp;
 	if( len <= 0 ) return 0;
+	if( !destroy && lmt-inp < len ) len = lmt-inp;
 	demand(otell()+len);
 	memmove(inp,bp,len);
 	inp += len;
@@ -324,8 +325,12 @@ int XMLTag::read_tag(FileXML *xml)
 		else
 			term = ' ';
 		value_start = buf->itell()-1;
-		while( ch >= 0 && (ch!=term && ch!=right_delm && ch!='\n') )
+		while( ch >= 0 ) {
+// old edl bug work-around, allow nl in quoted string
+			if( ch==term || ch==right_delm ) break;
+			if( ch=='\n' && term!='\"' ) break;
 			ch = buf->next();
+		}
 		if( ch < 0 ) EOB_RETURN();
 		value_end = buf->itell()-1;
 // add property
@@ -489,7 +494,7 @@ int FileXML::skip_tag()
 	return 1;
 }
 
-int FileXML::read_data_until(const char *tag_end, char *out, int len)
+int FileXML::read_data_until(const char *tag_end, char *out, int len, int skip)
 {
 	long ipos = buffer->itell();
 	int opos = 0, pos = -1;
@@ -518,15 +523,15 @@ int FileXML::read_data_until(const char *tag_end, char *out, int len)
 		++pos;
 	}
 // if end tag is reached, pos is left on the < of the end tag
-	if( pos >= 0 && !tag_end[pos] )
+	if( !skip && pos >= 0 && !tag_end[pos] )
 		buffer->iseek(ipos);
 	return opos;
 }
 
-int FileXML::read_text_until(const char *tag_end, char *out, int len)
+int FileXML::read_text_until(const char *tag_end, char *out, int len, int skip)
 {
 	char data[len+1];
-	int opos = read_data_until(tag_end, data, len);
+	int opos = read_data_until(tag_end, data, len, skip);
 	decode(out, data, opos);
 	return 0;
 }