diff options
| author | bubnikv <bubnikv@gmail.com> | 2018-11-20 16:03:57 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2018-11-20 16:03:57 +0300 |
| commit | ee4ba7207179257893d37071b77365c476dd8fe7 (patch) | |
| tree | 2a8ceed552ddbbfb51ea3f02c63c36af1436fdd1 /xs/src/avrdude/stk500v2.c | |
| parent | 6dc1bf5c08b7935dfbc55d35dea31148d09732f8 (diff) | |
| parent | 4f676de1616c3942721e2431720c8de255be326b (diff) | |
Merge branch 'master' into stableversion_1.41.2
Diffstat (limited to 'xs/src/avrdude/stk500v2.c')
| -rw-r--r-- | xs/src/avrdude/stk500v2.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xs/src/avrdude/stk500v2.c b/xs/src/avrdude/stk500v2.c index 4d62640c0..691152b46 100644 --- a/xs/src/avrdude/stk500v2.c +++ b/xs/src/avrdude/stk500v2.c @@ -295,9 +295,10 @@ static int stk600_xprog_program_enable(PROGRAMMER * pgm, AVRPART * p); void stk500v2_setup(PROGRAMMER * pgm) { if ((pgm->cookie = malloc(sizeof(struct pdata))) == 0) { - avrdude_message(MSG_INFO, "%s: stk500v2_setup(): Out of memory allocating private data\n", - progname); - exit(1); + // avrdude_message(MSG_INFO, "%s: stk500v2_setup(): Out of memory allocating private data\n", + // progname); + // exit(1); + avrdude_oom("stk500v2_setup(): Out of memory allocating private data\n"); } memset(pgm->cookie, 0, sizeof(struct pdata)); PDATA(pgm)->command_sequence = 1; |