mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-04 11:40:22 +00:00
Code Issues Releases Activity

* lib-src/emacsclient.c (send_to_emacs): Avoid invalid strcpy

Browse Source 
upon partial send.

Fixes: debbugs:11374
This commit is contained in:
Jim Meyering 2012-05-02 18:41:27 +08:00 committed by Chong Yidong
parent c7b8541ee7
commit 1e6f32f816
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib-src/ChangeLog
View File

@ -1,3 +1,8 @@
2012-05-02 Jim Meyering <jim@meyering.net>
* emacsclient.c (send_to_emacs): Avoid invalid strcpy upon partial
send (Bug#11374).
2012-04-29 Andreas Schwab <schwab@linux-m68k.org>
* make-docfile.c (scan_lisp_file) [DEBUG]: Also skip if and

40
lib-src/emacsclient.c
View File

@ -119,6 +119,8 @@ char *(getcwd) (char *, size_t);
# define IF_LINT(Code) /* empty */
#endif
#define min(x, y) (((x) < (y)) ? (x) : (y))
/* Name used to invoke this program. */
const char *progname;
@ -783,33 +785,35 @@ sock_err_message (const char *function_name)
static void
send_to_emacs (HSOCKET s, const char *data)
{
while (data)
size_t dlen;
if (!data)
return;
dlen = strlen (data);
while (*data)
{
size_t dlen = strlen (data);
if (dlen + sblen >= SEND_BUFFER_SIZE)
{
int part = SEND_BUFFER_SIZE - sblen;
strncpy (&send_buffer[sblen], data, part);
data += part;
sblen = SEND_BUFFER_SIZE;
}
else if (dlen)
{
strcpy (&send_buffer[sblen], data);
data = NULL;
sblen += dlen;
}
else
break;
size_t part = min (dlen, SEND_BUFFER_SIZE - sblen);
memcpy (&send_buffer[sblen], data, part);
data += part;
sblen += part;
if (sblen == SEND_BUFFER_SIZE
|| (sblen > 0 && send_buffer[sblen-1] == '\n'))
{
int sent = send (s, send_buffer, sblen, 0);
if (sent < 0)
{
message (TRUE, "%s: failed to send %d bytes to socket: %s\n",
progname, sblen, strerror (errno));
fail ();
}
if (sent != sblen)
strcpy (send_buffer, &send_buffer[sent]);
memmove (send_buffer, &send_buffer[sent], sblen - sent);
sblen -= sent;
}
dlen -= part;
}
}