X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffilexml.C;h=f474317853562554b3a36b9429adc3352ff90bc3;hb=a95193c3fd88733d184f2d460eca1fe6ddf8af28;hp=065dce7db07758c48a49b9a6366a3dac0e0180e1;hpb=7ead44762b23da404eee89b63e0474153fdf58a1;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/filexml.C b/cinelerra-5.1/cinelerra/filexml.C
index 065dce7d..f4743178 100644
--- a/cinelerra-5.1/cinelerra/filexml.C
+++ b/cinelerra-5.1/cinelerra/filexml.C
@@ -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