Changeset bc41f3a3 in mainline

Timestamp:

2016-04-25T08:14:01Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6f2c1ff

Parents:

38ad239

git-author:

Manuele Conti <conti.manuele@…> (2016-04-25 08:14:01)

git-committer:

Jakub Jermar <jakub@…> (2016-04-25 08:14:01)

Message:

bdsh: Close fd and free buffer in error paths

File:

• uspace/app/bdsh/cmds/modules/mkfile/mkfile.c (modified) (2 diffs)

uspace/app/bdsh/cmds/modules/mkfile/mkfile.c

@@ -165 +165 @@
                 const char byte = 0x00;
 
-                if ((rc2 = lseek(fd, file_size - 1, SEEK_SET)) < 0)
+                if ((rc2 = lseek(fd, file_size - 1, SEEK_SET)) < 0) {
+                        close(fd);
                         goto error;
+                }
 
                 rc2 = write(fd, &byte, sizeof(char));
-                if (rc2 < 0)
+                if (rc2 < 0) {
+                        close(fd);
                         goto error;
+                }
                 return CMD_SUCCESS;
         }
@@ -187 +191 @@
                         printf("%s: Error writing file (%d).\n", cmdname, errno);
                         close(fd);
+                        free(buffer);
                         return CMD_FAILURE;
                 }