diff options
author | Jean Cyr <jcyr@dillobits.com> | 2014-07-10 00:41:09 -0400 |
---|---|---|
committer | Jean Cyr <jcyr@dillobits.com> | 2014-07-10 00:41:09 -0400 |
commit | 8c6745d53fcb75c14caa21f3cb917ab6fa5f2bcf (patch) | |
tree | f4d626c4896ff52558bc371c4d49c349144e6653 /src | |
parent | 8f2340acaf37288d2507a94611f2994fd1a89756 (diff) | |
download | px4-firmware-8c6745d53fcb75c14caa21f3cb917ab6fa5f2bcf.tar.gz px4-firmware-8c6745d53fcb75c14caa21f3cb917ab6fa5f2bcf.tar.bz2 px4-firmware-8c6745d53fcb75c14caa21f3cb917ab6fa5f2bcf.zip |
Prevent stack overflow when flashing px4io
Large local variable causing stack overflow when attempting to flash
IO!!!
Diffstat (limited to 'src')
-rw-r--r-- | src/drivers/px4io/px4io_uploader.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/drivers/px4io/px4io_uploader.cpp b/src/drivers/px4io/px4io_uploader.cpp index 7b6361a7c..652949e41 100644 --- a/src/drivers/px4io/px4io_uploader.cpp +++ b/src/drivers/px4io/px4io_uploader.cpp @@ -39,6 +39,7 @@ #include <nuttx/config.h> #include <sys/types.h> +#include <stdlib.h> #include <stdint.h> #include <stdbool.h> #include <assert.h> @@ -413,11 +414,17 @@ static int read_with_retry(int fd, void *buf, size_t n) int PX4IO_Uploader::program(size_t fw_size) { - uint8_t file_buf[PROG_MULTI_MAX]; + uint8_t *file_buf; ssize_t count; int ret; size_t sent = 0; + file_buf = (uint8_t *)malloc(PROG_MULTI_MAX); + if (!file_buf) { + log("Can't allocate program buffer"); + return -ENOMEM; + } + log("programming %u bytes...", (unsigned)fw_size); ret = lseek(_fw_fd, 0, SEEK_SET); @@ -438,8 +445,10 @@ PX4IO_Uploader::program(size_t fw_size) (int)errno); } - if (count == 0) + if (count == 0) { + free(file_buf); return OK; + } sent += count; @@ -455,9 +464,12 @@ PX4IO_Uploader::program(size_t fw_size) ret = get_sync(1000); - if (ret != OK) + if (ret != OK) { + free(file_buf); return ret; + } } + free(file_buf); return OK; } |