@@ -1096,7 +1096,7 @@ redata_data_compare(redata_t *redata, long cmppos, char *buf, long buflen)

         long compared;

         long n;

         int res;

-        if(redata==NULL || pos<0 || buf==NULL || buflen<0

+        if(redata==NULL || cmppos<0 || buf==NULL || buflen<0

           || cmppos>redata_getused(redata)

           || (cmppos+buflen)>redata_getused(redata))

                 return(-1); /* sanity check failed */

@@ -48,6 +48,7 @@ main(int argc, char *argv[])

                 {"newfile_32769",test_newfile,PREFIX "FILE", NULL, 32769, 0},

                 {"newfile_131072",test_newfile,PREFIX "FILE", NULL, 131072, 0},

                 {"testedit_add",test_edit,PREFIX "EDIT", "A0$Testing add$",0,0},

+                {"testedit_del",test_edit,PREFIX "EDIT", "A0$Testing add/del$D8$add/$",0,0},

         };

         redata_t *redata;

         int i;

@@ -149,7 +150,7 @@ test_edit(redata_t *redata, char *filename, char *edits, int filesize, int seed)

         static char errorbuf[256];

         char progress[256];

         int k;

-        int cursize;

+        int cursize,maxsize;

         char *ptr;

         int l;

         char *mem;

@@ -162,7 +163,7 @@ test_edit(redata_t *redata, char *filename, char *edits, int filesize, int seed)

         mem=NULL;

 fprintf(stderr,"\ntest_edit(%s%s%s,%s%s%s,%i,%i);\nResult: ",(filename!=NULL)?"\"":"",(filename!=NULL)?filename:"NULL",(filename!=NULL)?"\"":"",(edits!=NULL)?"\"":"",(edits!=NULL)?edits:"NULL",(edits!=NULL)?"\"":"",filesize,seed);

         /* two passes: k==0 count needed memory, k==1 do edits */

-        for(k=0,cursize=filesize,progress[0]='\0';k<2;k++,cursize=0,progress[0]='\0') {

+        for(k=0,maxsize=cursize=filesize,progress[0]='\0';k<2;k++,cursize=0,progress[0]='\0') {

                 for(ptr=edits;*ptr!='\0';) {

                         if(k!=0) {

                                 redata_memhash(redata,mem,cursize,hash129_memold);

@@ -196,6 +197,40 @@ fprintf(stderr,"\ntest_edit(%s%s%s,%s%s%s,%i,%i);\nResult: ",(filename!=NULL)?"\

                                 cursize+=size;

                                 ptr+=size;

                                 ptr+=(*ptr!='\0')?1:0;

+                        } else if(*ptr=='D') {

+                                /* D<delpos><endchar><text><endchar> */

+                                ptr++;

+                                errno=0;

+                                l=(int)strtol(ptr,&ptr,10);

+                                if(errno!=0) {

+                                        if(mem!=NULL)

+                                                free(mem),mem=NULL;

+                                        return("test_edit(): error parsing position");

+                                }

+                                endcode=*ptr;

+                                ptr+=(*ptr!='\0')?1:0;

+                                ptrend=strchr(ptr,endcode);

+                                ptrend=(ptrend==NULL)?ptr+strlen(ptr):ptrend;

+                                size=ptrend-ptr;

+                                if(l<0 || (l+size)>cursize) {

+                                        if(mem!=NULL)

+                                                free(mem),mem=NULL;

+                                        return("test_edit(): internal error: invalid pasition or size");

+                                }

+                                if(k!=0) {

+                                        if(memcmp(mem+l,ptr,size)!=0

+                                          || redata_data_compare(redata,l,ptr,size)!=0) {

+                                                if(mem!=NULL)

+                                                        free(mem),mem=NULL;

+                                                return("test_edit(): internal error: deletion data doesn't match");

+                                        }

+                                        /* editing */

+                                        memmove(mem+l,mem+l+size,cursize-l-size);

+                                        redata_op_del(redata,l,size,NULL);

+                                }

+                                cursize-=size;

+                                ptr+=size;

+                                ptr+=(*ptr!='\0')?1:0;

                         } else {

                                 if(mem!=NULL)

                                         free(mem),mem=NULL;

@@ -204,6 +239,8 @@ fprintf(stderr,"\ntest_edit(%s%s%s,%s%s%s,%i,%i);\nResult: ",(filename!=NULL)?"\

                                 errorbuf[sizeof(errorbuf)-1]='\0';

                                 return(errorbuf);

                         }

+                        if(cursize>maxsize)

+                                maxsize=cursize;

                         if(k!=0) {

 /*if(k!=0) redata_save(redata,"test.post");*/

                                 redata_hash(redata,hash129_redata);

@@ -242,7 +279,7 @@ fprintf(stderr,"\ntest_edit(%s%s%s,%s%s%s,%i,%i);\nResult: ",(filename!=NULL)?"\

                 }

                 if(k==0) {

                         /* reserve memory, do init */

-                        if((mem=malloc_data(cursize,seed))==NULL)

+                        if((mem=malloc_data(maxsize,seed))==NULL)

                                 return("insuf. mem. for temp. buffer");

                         if(write_file(filename,mem,filesize)==-1)

                                 return("couldn't create temporary file");