mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-01 01:41:01 -08:00
Code Issues Projects Releases Wiki Activity

(send_process): Keep decoded string in a local

Browse source 
variable and protect it from GC.  (Bug#3521)
This commit is contained in:
Andreas Schwab 2009-06-28 20:12:20 +00:00
parent 485422be11
commit b96075879a
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2009-06-28 Andreas Schwab <schwab@linux-m68k.org>
* process.c (send_process): Keep decoded string in a local
variable and protect it from GC. (Bug#3521)
2009-06-28 Eli Zaretskii <eliz@gnu.org>
* term.c (create_tty_output) [MSDOS]: #ifdef away.

12
src/process.c
View file

@ -5550,10 +5550,11 @@ send_process (proc, buf, len, object)
struct Lisp_Process *p = XPROCESS (proc);
int rv;
struct coding_system *coding;
struct gcpro gcpro1;
struct gcpro gcpro1, gcpro2;
SIGTYPE (*volatile old_sigpipe) ();
Lisp_Object dst_object = Qnil;
GCPRO1 (object);
GCPRO2 (object, dst_object);
if (p->raw_status_new)
update_status (p);
@ -5632,7 +5633,8 @@ send_process (proc, buf, len, object)
}
len = coding->produced;
buf = SDATA (coding->dst_object);
dst_object = coding->dst_object;
buf = SDATA (dst_object);
}
if (pty_max_bytes == 0)
@ -5764,7 +5766,7 @@ send_process (proc, buf, len, object)
/* Running filters might relocate buffers or strings.
Arrange to relocate BUF. */
if (CODING_REQUIRE_ENCODING (coding))
offset = buf - SDATA (coding->dst_object);
offset = buf - SDATA (dst_object);
else if (BUFFERP (object))
offset = BUF_PTR_BYTE_POS (XBUFFER (object), buf);
else if (STRINGP (object))
@ -5777,7 +5779,7 @@ send_process (proc, buf, len, object)
#endif
if (CODING_REQUIRE_ENCODING (coding))
buf = offset + SDATA (coding->dst_object);
buf = offset + SDATA (dst_object);
else if (BUFFERP (object))
buf = BUF_BYTE_ADDRESS (XBUFFER (object), offset);
else if (STRINGP (object))