[Emacs-diffs] emacs/src ChangeLog process.c

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 09/02/10 22:32:41

Modified files:
        src            : ChangeLog process.c 

Log message:
        (send_process): Properly relocate pointer into data
        when using encoded data.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7347&r2=1.7348
http://cvs.savannah.gnu.org/viewcvs/emacs/src/process.c?cvsroot=emacs&r1=1.579&r2=1.580

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7347
retrieving revision 1.7348
diff -u -b -r1.7347 -r1.7348
--- ChangeLog   9 Feb 2009 00:45:17 -0000       1.7347
+++ ChangeLog   10 Feb 2009 22:32:39 -0000      1.7348
@@ -1,3 +1,8 @@
+2009-02-10  Andreas Schwab  <address@hidden>
+
+       * process.c (send_process): Properly relocate pointer into data
+       when using encoded data.
+
 2009-02-08  ARISAWA Akihiro  <address@hidden>
 
        * coding.c (detect_coding_charset): Fix previous change.

Index: process.c
===================================================================
RCS file: /sources/emacs/emacs/src/process.c,v
retrieving revision 1.579
retrieving revision 1.580
diff -u -b -r1.579 -r1.580
--- process.c   29 Jan 2009 14:34:38 -0000      1.579
+++ process.c   10 Feb 2009 22:32:40 -0000      1.580
@@ -5745,7 +5745,9 @@
 
                      /* Running filters might relocate buffers or strings.
                         Arrange to relocate BUF.  */
-                     if (BUFFERP (object))
+                     if (CODING_REQUIRE_ENCODING (coding))
+                       offset = buf - SDATA (coding->dst_object);
+                     else if (BUFFERP (object))
                        offset = BUF_PTR_BYTE_POS (XBUFFER (object), buf);
                      else if (STRINGP (object))
                        offset = buf - SDATA (object);
@@ -5756,7 +5758,9 @@
                      wait_reading_process_output (1, 0, 0, 0, Qnil, NULL, 0);
 #endif
 
-                     if (BUFFERP (object))
+                     if (CODING_REQUIRE_ENCODING (coding))
+                       buf = offset + SDATA (coding->dst_object);
+                     else if (BUFFERP (object))
                        buf = BUF_BYTE_ADDRESS (XBUFFER (object), offset);
                      else if (STRINGP (object))
                        buf = offset + SDATA (object);