procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Backport Bug#11374 fix from trunk

Browse source
This commit is contained in:
Chong Yidong 2012-05-02 21:06:08 +08:00
parent c635b6d545
commit 687d464f5c
2 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib-src/ChangeLog
View file

@ -1,4 +1,7 @@
2012-05-02 Jim Meyering <meyering@redhat.com>
2012-05-02 Jim Meyering <jim@meyering.net>
* emacsclient.c (send_to_emacs): Avoid invalid strcpy upon partial
send (Bug#11374).
* lib-src/pop.c (pop_stat, pop_list, pop_multi_first, pop_last):
NUL-terminate the error buffer (Bug#11372).

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;
}
}