commit-grub
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[2403] 2009-07-10 Bean <address@hidden>


From: Robert Millan
Subject: [2403] 2009-07-10 Bean <address@hidden>
Date: Fri, 10 Jul 2009 20:19:08 +0000

Revision: 2403
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2403
Author:   robertmh
Date:     2009-07-10 20:19:08 +0000 (Fri, 10 Jul 2009)
Log Message:
-----------
2009-07-10  Bean  <address@hidden>
2009-07-10  Robert Millan  <address@hidden>

        * kern/ieee1275/openfw.c (grub_children_iterate)
        (grub_devalias_iterate): Fix size evaluation for property or path
        strings, which was broken since r2132.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/kern/ieee1275/openfw.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-07-07 20:13:39 UTC (rev 2402)
+++ trunk/grub2/ChangeLog       2009-07-10 20:19:08 UTC (rev 2403)
@@ -1,3 +1,10 @@
+2009-07-10  Bean  <address@hidden>
+2009-07-10  Robert Millan  <address@hidden>
+
+       * kern/ieee1275/openfw.c (grub_children_iterate)
+       (grub_devalias_iterate): Fix size evaluation for property or path
+       strings, which was broken since r2132.
+
 2009-07-07  Pavel Roskin  <address@hidden>
 
        * commands/search.c (search_file): Merge into ...

Modified: trunk/grub2/kern/ieee1275/openfw.c
===================================================================
--- trunk/grub2/kern/ieee1275/openfw.c  2009-07-07 20:13:39 UTC (rev 2402)
+++ trunk/grub2/kern/ieee1275/openfw.c  2009-07-10 20:19:08 UTC (rev 2403)
@@ -78,15 +78,15 @@
       grub_ssize_t actual;
 
       if (grub_ieee1275_get_property (child, "device_type", childtype,
-                                     sizeof childtype, &actual))
+                                     IEEE1275_MAX_PROP_LEN, &actual))
        continue;
 
-      if (grub_ieee1275_package_to_path (child, childpath, sizeof childpath,
-                                        &actual))
+      if (grub_ieee1275_package_to_path (child, childpath,
+                                        IEEE1275_MAX_PATH_LEN, &actual))
        continue;
 
       if (grub_ieee1275_get_property (child, "name", childname,
-                                     sizeof childname, &actual))
+                                     IEEE1275_MAX_PATH_LEN, &actual))
        continue;
 
       grub_sprintf (fullname, "%s/%s", devpath, childname);
@@ -176,7 +176,7 @@
        }
 
       if (grub_ieee1275_get_property (dev, "device_type", devtype,
-                                     sizeof devtype, &actual))
+                                     IEEE1275_MAX_PROP_LEN, &actual))
        {
          /* NAND device don't have device_type property.  */
           devtype[0] = 0;





reply via email to

[Prev in Thread] Current Thread [Next in Thread]