Changeset 3f2ea63 in mainline

Timestamp:

2012-08-01T20:44:10Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

23db8aa

Parents:

78d3a00

Message:

Bithenge: fix memory leak on error

File:

• uspace/app/bithenge/expression.c (modified) (1 diff)

uspace/app/bithenge/expression.c

@@ -285 +285 @@
         int rc;
         const_expression_t *self = malloc(sizeof(*self));
-        if (!self)
-                return ENOMEM;
+        if (!self) {
+                rc = ENOMEM;
+                goto error;
+        }
 
         rc = bithenge_init_expression(const_as_expression(self),
             &const_expression_ops);
-        if (rc != EOK) {
-                free(self);
-                return rc;
-        }
+        if (rc != EOK)
+                goto error;
 
         self->node = node;
         *out = const_as_expression(self);
         return EOK;
+
+error:
+        free(self);
+        bithenge_node_dec_ref(node);
+        return rc;
 }