Patch from Vladimir:

    1) fixed a bug that could crash df, mount, and umount applets if the root
    device name was longer then the word "root" (/dev/loop1 vs /dev/root) -
    2) severl functions needed static declaration in the umount applet
    3) update declaration for function in last_char_is() in libbb


git-svn-id: svn://busybox.net/trunk/busybox@2647 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 3 insertions, 1 deletions

diff --git a/df.c b/df.c
index 21a1dbb31..df6874433 100644
--- a/df.c
+++ b/df.c
@@ -60,7 +60,9 @@ static int do_df(char *device, const char *mount_point)
                 if (strcmp(device, "/dev/root") == 0) {
                         /* Adjusts device to be the real root device,
                          * or leaves device alone if it can't find it */
-                        find_real_root_device_name( device);
+                        device = find_real_root_device_name(device);
+                        if(device==NULL)
+                                return FALSE;
                 }
 #ifdef BB_FEATURE_HUMAN_READABLE
                 switch (df_disp_hr) {