circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-03 16:46:18 +00:00
Code Issues Projects Releases Wiki Activity

malloc(0) may return NULL, so only assume that is an error if allocating

Browse Source 
more than zero.
This commit is contained in:
Nicholas Marriott
2010-11-11 20:41:08 +00:00
parent 9c541e42f0
commit 94c2adf499
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compat/imsg.c
View File

@@ -1,4 +1,4 @@
/* $Id: imsg.c,v 1.5 2010-06-06 00:08:28 tcunha Exp $ */ /* $Id: imsg.c,v 1.6 2010-11-11 20:41:08 nicm Exp $ */
/* $OpenBSD: imsg.c,v 1.3 2010/05/26 13:56:07 nicm Exp $ */ /* $OpenBSD: imsg.c,v 1.3 2010/05/26 13:56:07 nicm Exp $ */
/* /*
@@ -111,7 +111,7 @@ imsg_get(struct imsgbuf *ibuf, struct imsg *imsg)
return (0); return (0);
datalen = imsg->hdr.len - IMSG_HEADER_SIZE; datalen = imsg->hdr.len - IMSG_HEADER_SIZE;
ibuf->r.rptr = ibuf->r.buf + IMSG_HEADER_SIZE; ibuf->r.rptr = ibuf->r.buf + IMSG_HEADER_SIZE;
if ((imsg->data = malloc(datalen)) == NULL) if (datalen != 0 && (imsg->data = malloc(datalen + 1)) == NULL)
return (-1); return (-1);
if (imsg->hdr.flags & IMSGF_HASFD) if (imsg->hdr.flags & IMSGF_HASFD)