aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLorenz Meier <lm@qgroundcontrol.org>2014-11-12 13:39:44 +0100
committerLorenz Meier <lm@qgroundcontrol.org>2014-11-12 13:39:44 +0100
commit2f3ffdd50847a6f7b1796e54c9588dd596e55f2f (patch)
tree195f2ed1eb13508f432db4b4e710c37ef7313322 /src
parent26b975359e3e75945cd27862d92c518f19571406 (diff)
parent3f3353f2c4ad9f7b8263379c8b31bd9a437b0174 (diff)
downloadpx4-firmware-2f3ffdd50847a6f7b1796e54c9588dd596e55f2f.tar.gz
px4-firmware-2f3ffdd50847a6f7b1796e54c9588dd596e55f2f.tar.bz2
px4-firmware-2f3ffdd50847a6f7b1796e54c9588dd596e55f2f.zip
Merge pull request #1435 from tridge/pullrequest-fix-stream-leak
mixer: fixed stream handle leakage
Diffstat (limited to 'src')
-rw-r--r--src/modules/systemlib/mixer/mixer_load.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/systemlib/mixer/mixer_load.c b/src/modules/systemlib/mixer/mixer_load.c
index bf3428a50..0d629d610 100644
--- a/src/modules/systemlib/mixer/mixer_load.c
+++ b/src/modules/systemlib/mixer/mixer_load.c
@@ -91,6 +91,7 @@ int load_mixer_file(const char *fname, char *buf, unsigned maxlen)
/* if the line is too long to fit in the buffer, bail */
if ((strlen(line) + strlen(buf) + 1) >= maxlen) {
warnx("line too long");
+ fclose(fp);
return -1;
}
@@ -98,6 +99,7 @@ int load_mixer_file(const char *fname, char *buf, unsigned maxlen)
strcat(buf, line);
}
+ fclose(fp);
return 0;
}