summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2010-06-21 16:27:23 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2010-06-21 16:27:23 +0000
commit9511a0ab236d7ec5fb8b42b83dbea09053d3b36f (patch)
tree01623b8596e4530ecef40a0862906ccf5bca7021
parent2010-06-16 Joel Sherrill <joel.sherrilL@OARcorp.com> (diff)
downloadrtems-9511a0ab236d7ec5fb8b42b83dbea09053d3b36f.tar.bz2
2010-06-21 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1554/cpukit Coverity Id 17 * libi2c/libi2c.c: Fix memory leak on error.
-rw-r--r--cpukit/ChangeLog6
-rw-r--r--cpukit/libi2c/libi2c.c5
2 files changed, 11 insertions, 0 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index bbe7ed8b3a..686ac0cbfb 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-21 Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+ PR 1554/cpukit
+ Coverity Id 17
+ * libi2c/libi2c.c: Fix memory leak on error.
+
2010-03-17 Chris Johns <chrisj@rtems.org>
* libfs/src/dosfs/msdos_create.c: Fix the date/time call order to
diff --git a/cpukit/libi2c/libi2c.c b/cpukit/libi2c/libi2c.c
index 64272ef5ae..fdca014754 100644
--- a/cpukit/libi2c/libi2c.c
+++ b/cpukit/libi2c/libi2c.c
@@ -395,11 +395,13 @@ rtems_libi2c_register_bus (const char *name, rtems_libi2c_bus_t * bus)
/* check */
if ('/' != *nmcpy) {
safe_printf ( DRVNM "Bad name: must be an absolute path starting with '/'\n");
+ free( nmcpy );
return -RTEMS_INVALID_NAME;
}
/* file must not exist */
if (!stat (nmcpy, &sbuf)) {
safe_printf ( DRVNM "Bad name: file exists already\n");
+ free( nmcpy );
return -RTEMS_INVALID_NAME;
}
@@ -412,6 +414,7 @@ rtems_libi2c_register_bus (const char *name, rtems_libi2c_bus_t * bus)
if (i) {
safe_printf ( DRVNM "Get %s status failed: %s\n",
nmcpy, strerror(errno));
+ free( nmcpy );
return -RTEMS_INVALID_NAME;
}
/* should be a directory since name terminates in '/' */
@@ -419,11 +422,13 @@ rtems_libi2c_register_bus (const char *name, rtems_libi2c_bus_t * bus)
if (!libmutex) {
safe_printf ( DRVNM "Library not initialized\n");
+ free( nmcpy );
return -RTEMS_NOT_DEFINED;
}
if (bus == NULL || bus->size < sizeof (*bus)) {
safe_printf ( DRVNM "No bus-ops or size too small -- misconfiguration?\n");
+ free( nmcpy );
return -RTEMS_NOT_CONFIGURED;
}