commit - 90027012e7da8426bd5bdf712f99b344fef1533f
commit + 835c61781d3b5e509cb2a5a4ce3e1ec5594ed647
blob - 78b15f20fb71ed8451fbc116e70d4b1641c47a1e
blob + d5857e65e5d2ae2af8832c05976058232c04ef79
--- thingsd/client.c
+++ thingsd/client.c
struct clt *clt = NULL, *tclt;
size_t len, n;
int fd = bev->ev_read.ev_fd;
- char *pkt;
+ char *pkt, *npkt;
TAILQ_FOREACH(tclt, &pthgsd->clts, entry) {
if (tclt->fd == fd) {
evbuffer_remove(clt->evb, pkt, len);
/* peak into packet and ensure it's a subscription packet */
if (pkt[0] == 0x7E && pkt[1] == 0x7E && pkt[2] == 0x7E) {
- memmove(pkt, pkt+3, len+3+1);
- parse_buf(clt, pkt);
+ if ((npkt = calloc(len, sizeof(*npkt))) == NULL)
+ return;
+ memmove(npkt, pkt+3, len-3);
+ parse_buf(clt, npkt, len-3);
+ free(pkt);
+ free(npkt);
if (clt->subscribed)
bufferevent_enable(clt->bev, EV_READ|EV_WRITE);
}
blob - 839b04e748828c89f3802793d256b7717bfac2c1
blob + 604fe6ee2b67c775cc7bf97b040d0a960ad66993
--- thingsd/parse.y
+++ thingsd/parse.y
const int sparity = (sizeof(parity) /
sizeof(const char *));
-int bc, pc, my_fd;
+int bc, pc, my_fd, pkt_len;
int popfile(void);
int popbuff(void);
int yyparse(void);
if (parsebuf) {
/* Read character from the parsebuffer instead of file input */
if (parseindex >= 0) {
- if (parseindex > (int)strlen(parsebuf))
- return 0;
+ if (parsebuf == NULL)
+ return(0);
+ if (parseindex > pkt_len)
+ return(0);
c = parsebuf[parseindex++];
if (c != '\0')
return(c);
+ parsebuf = NULL;
} else
parseindex++;
}
}
int
-parse_buf(struct clt *pclt, u_char *pkt)
+parse_buf(struct clt *pclt, u_char *pkt, int len)
{
int errors;
+ pkt_len = len;
tclt = pclt;
my_fd = tclt->fd;
if ((file = pushbuff(pkt)) == NULL)
yyparse();
errors = file->errors;
popbuff();
- free(pkt);
return (errors ? -1 : 0);
}
blob - d320e7a144da300ba5fcc0eb98a0eedcf1b6009c
blob + 7519dfbc183ea0144b43aa8dc503500d041320c0
--- thingsd/thingsd.h
+++ thingsd/thingsd.h
/* parse.y */
struct thg *new_thg(char *);
int parse_conf(const char *);
-int parse_buf(struct clt *, u_char *);
+int parse_buf(struct clt *, u_char *, int);
/* serial.c */
void open_thgs(struct thgsd *, bool);