From 30e1d09584e3f7395b37c1eedbe06a5045b6c65d Mon Sep 17 00:00:00 2001 From: bsongis Date: Thu, 22 Jan 2015 20:17:26 +0100 Subject: [PATCH] Adresses comments in #2036 - Thanks to Damjan for the review! --- radio/src/sdcard.cpp | 1 + radio/src/strhelpers.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/radio/src/sdcard.cpp b/radio/src/sdcard.cpp index dc20e13d1..525386456 100644 --- a/radio/src/sdcard.cpp +++ b/radio/src/sdcard.cpp @@ -166,6 +166,7 @@ const char *fileCopy(const char *filename, const char *srcDir, const char *destD result = f_open(&dstFile, path, FA_CREATE_ALWAYS | FA_WRITE); if (result != FR_OK) { + f_close(&srcFile); return SDCARD_ERROR(result); } diff --git a/radio/src/strhelpers.cpp b/radio/src/strhelpers.cpp index 4211e63a0..0d49fc9ac 100644 --- a/radio/src/strhelpers.cpp +++ b/radio/src/strhelpers.cpp @@ -177,7 +177,8 @@ char *strAppend(char *dest, const char *source, int len) { while ((*dest++ = *source++)) { if (--len == 0) { - *dest++ = '\0'; + *dest = '\0'; + return dest; } } return dest - 1;