loop: don't infloop

Correct a bug introduced in commit 52815877, 2007-06-15,
"Make loop_probe and loop_clobber work with sector_size > 512, too."
* libparted/labels/loop.c (loop_clobber): Initialize "i" before
the loop, not inside it.
* tests/t0400-loop-clobber-infloop.sh: Test for this.
* tests/Makefile.am (TESTS): Add it.

diff --git a/libparted/labels/loop.c b/libparted/labels/loop.c
index 74a2c27..dc1a86e 100644 (file)
--- a/libparted/labels/loop.c
+++ b/libparted/labels/loop.c
@@ -83,8 +83,8 @@ loop_clobber (PedDevice* dev)
 
        memset (buf, 0, dev->sector_size);
 
+       PedSector i = 0;
        while (loop_probe (dev)) {
-               PedSector i = 0;
                if (!ped_device_write (dev, buf, i++, 1))
                        return 0;
        }

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5090b6a..399653b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,6 +6,7 @@ TESTS = \
   t0202-gpt-pmbr.sh \
   t0250-gpt.sh \
   t0300-dos-on-gpt.sh \
+  t0400-loop-clobber-infloop.sh \
   t1000-mkpartfs.sh \
   t1100-busy-label.sh \
   t1500-small-ext2.sh \

diff --git a/tests/t0400-loop-clobber-infloop.sh b/tests/t0400-loop-clobber-infloop.sh
new file mode 100644 (file)
index 0000000..824c410
--- /dev/null
+++ b/tests/t0400-loop-clobber-infloop.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# Copyright (C) 2009 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+test_description='do not infloop in loop_clobber'
+
+: ${srcdir=.}
+. $srcdir/test-lib.sh
+
+N=1M
+dev=loop-file
+test_expect_success \
+    'create a file large enough to hold a partition table' \
+    'dd if=/dev/null of=$dev bs=1 seek=$N 2> /dev/null'
+
+test_expect_success \
+    'create a swap partition in the entire device' \
+    'mkswap $dev'
+
+# There was a small interval (no release) during which this would infloop.
+test_expect_success \
+    'create a dos partition table' \
+    'parted -s $dev mklabel msdos > out 2>&1'
+test_expect_success 'expect no output' 'compare out /dev/null'
+
+test_done