Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/linenoise_stack_alloc' into 'master'

Browse source 
console: linenoise: move allocations from stack to heap, fix calloc result checking (Github PR)

Merges https://github.com/espressif/esp-idf/pull/5161

Closes IDFGH-3144

See merge request espressif/esp-idf!8612
This commit is contained in:
Ivan Grokhotkov 2020-05-06 13:21:56 +08:00
commit a97cd645ad
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
components/console/linenoise/linenoise.c
View file

@ -979,6 +979,9 @@ static void sanitize(char* src) {
char *linenoise(const char *prompt) { char *linenoise(const char *prompt) {
char *buf = calloc(1, LINENOISE_MAX_LINE); char *buf = calloc(1, LINENOISE_MAX_LINE);
int count = 0; int count = 0;
if (buf == NULL) {
return NULL;
}
if (!dumbmode) { if (!dumbmode) {
count = linenoiseRaw(buf, LINENOISE_MAX_LINE, prompt); count = linenoiseRaw(buf, LINENOISE_MAX_LINE, prompt);
} else { } else {
@ -1105,9 +1108,15 @@ int linenoiseHistorySave(const char *filename) {
* on error -1 is returned. */ * on error -1 is returned. */
int linenoiseHistoryLoad(const char *filename) { int linenoiseHistoryLoad(const char *filename) {
FILE *fp = fopen(filename,"r"); FILE *fp = fopen(filename,"r");
char buf[LINENOISE_MAX_LINE]; if (fp == NULL) {
return -1;
}
if (fp == NULL) return -1; char *buf = calloc(1, LINENOISE_MAX_LINE);
if (buf == NULL) {
fclose(fp);
return -1;
}
while (fgets(buf,LINENOISE_MAX_LINE,fp) != NULL) { while (fgets(buf,LINENOISE_MAX_LINE,fp) != NULL) {
char *p; char *p;
@ -1117,6 +1126,9 @@ int linenoiseHistoryLoad(const char *filename) {
if (p) *p = '\0'; if (p) *p = '\0';
linenoiseHistoryAdd(buf); linenoiseHistoryAdd(buf);
} }
free(buf);
fclose(fp); fclose(fp);
return 0; return 0;
} }