Use bounded memmove for trimtrailingspace selections

Author: rainman74

SRC/NPPTextFX.cpp

@@ -3666,25 +3666,26 @@ EXTERNC unsigned extendblockspaces(char **dest,unsigned *destsz,unsigned *destle
 #undef lold
 }
 
-EXTERNC unsigned trimtrailingspace(char *dest,unsigned *destlen) {
-#define lnew 0
-  unsigned n=0,lold;
-  char *d,*dp,*end;
-  if (dest) {
-    for(d=dest,end=dest+*destlen;d<end; ) {
-      dp=d;
-      d=memcspn(d,end,"\r\n",2);
-      for(d--,lold=0; d>=dp && *d==' '; d--, lold++);
-      d++;
-      if (lnew != lold) {
-        memmovetest(d+lnew,d+lold,*destlen-(d-dest)-lold+1);
-        *destlen += lnew-lold;
-        end += lnew-lold;
-        n++;
-      }
-      d=memspn(d,end,"\r\n",2);
-    }
-  }
+EXTERNC unsigned trimtrailingspace(char *dest,unsigned *destlen) {
+#define lnew 0
+  unsigned n=0,lold;
+  char *d,*lineend,*trimstart,*end;
+  if (dest) {
+    for(d=dest,end=dest+*destlen;d<end; ) {
+      lineend=memcspn(d,end,"\r\n",2);
+      trimstart=lineend;
+      while(trimstart>d && trimstart[-1]==' ') trimstart--;
+      lold=(unsigned)(lineend-trimstart);
+      if (lnew != lold) {
+        memmove(trimstart+lnew,lineend,*destlen-(unsigned)(lineend-dest));
+        *destlen += lnew-lold;
+        end += lnew-lold;
+        n++;
+        lineend=trimstart;
+      }
+      d=memspn(lineend,end,"\r\n",2);
+    }
+  }
   return(n);
 #undef lnew
 }