Merge branch 'ax_port_read-overflow'

timhawes · timhawes · commit cd3d827e09cf · 2020-05-02T11:16:59.000+01:00
diff --git a/src/tcp_axtls.c b/src/tcp_axtls.c
@@ -587,7 +587,7 @@ int ax_port_read(int fd, uint8_t *data, int len) {
     return 0;
   }
 
-  read_buf =(uint8_t*)calloc(fd_data->tcp_pbuf->len + 1, sizeof(uint8_t));
+  read_buf =(uint8_t*)calloc(len, sizeof(uint8_t));
   pread_buf = read_buf;
   if (pread_buf != NULL){
     recv_len = pbuf_copy_partial(fd_data->tcp_pbuf, read_buf, len, fd_data->pbuf_offset);

Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,7 @@ int ax_port_read(int fd, uint8_t *data, int len) {`
`587`	`587`	`return 0;`
`588`	`588`	`}`
`589`	`589`
`590`		`- read_buf =(uint8_t*)calloc(fd_data->tcp_pbuf->len + 1, sizeof(uint8_t));`
	`590`	`+ read_buf =(uint8_t*)calloc(len, sizeof(uint8_t));`
`591`	`591`	`pread_buf = read_buf;`
`592`	`592`	`if (pread_buf != NULL){`
`593`	`593`	`recv_len = pbuf_copy_partial(fd_data->tcp_pbuf, read_buf, len, fd_data->pbuf_offset);`