Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/probe.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/probe.c (modified) (2 diffs)

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/probe.c

@@ -576 +576 @@
            dev->bid_name, diff));
 
-    if (((fd = open(dev->bid_name, O_RDONLY)) < 0) ||
-        (fstat(fd, &st) < 0)) {
+    fd = open(dev->bid_name, O_RDONLY);
+    if (fd < 0
+     || fstat(fd, &st) < 0
+    ) {
+        if (fd >= 0)
+            close(fd);
         if (errno == ENXIO || errno == ENODEV || errno == ENOENT) {
             blkid_free_dev(dev);
@@ -654 +658 @@
     if (!dev->bid_type) {
         blkid_free_dev(dev);
+        close(fd);
         return NULL;
     }