|
 |
f96e0b |
From 49c649e13d580a76c2b26987a204ef4a859a1f0f Mon Sep 17 00:00:00 2001
|
|
|
f96e0b |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
Date: Mon, 15 Apr 2013 00:40:19 +0200
|
|
|
f96e0b |
Subject: [PATCH 314/482] * grub-core/kern/ieee1275/openfw.c
|
|
|
f96e0b |
(grub_ieee1275_devalias_next): Make source and destination differ.
|
|
|
f96e0b |
|
|
|
f96e0b |
---
|
|
|
f96e0b |
ChangeLog | 5 +++++
|
|
|
f96e0b |
grub-core/kern/ieee1275/openfw.c | 6 +++++-
|
|
|
f96e0b |
2 files changed, 10 insertions(+), 1 deletion(-)
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/ChangeLog b/ChangeLog
|
|
|
f96e0b |
index b372668..7469030 100644
|
|
|
f96e0b |
--- a/ChangeLog
|
|
|
f96e0b |
+++ b/ChangeLog
|
|
|
f96e0b |
@@ -1,5 +1,10 @@
|
|
|
f96e0b |
2013-04-15 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
|
|
|
f96e0b |
+ * grub-core/kern/ieee1275/openfw.c (grub_ieee1275_devalias_next): Make
|
|
|
f96e0b |
+ source and destination differ.
|
|
|
f96e0b |
+
|
|
|
f96e0b |
+2013-04-15 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
+
|
|
|
f96e0b |
* grub-core/disk/ieee1275/ofdisk.c: Fix CD-ROM and boot device
|
|
|
f96e0b |
detection.
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c
|
|
|
f96e0b |
index 90c092c..07c90f7 100644
|
|
|
f96e0b |
--- a/grub-core/kern/ieee1275/openfw.c
|
|
|
f96e0b |
+++ b/grub-core/kern/ieee1275/openfw.c
|
|
|
f96e0b |
@@ -193,18 +193,22 @@ grub_ieee1275_devalias_next (struct grub_ieee1275_devalias *alias)
|
|
|
f96e0b |
{
|
|
|
f96e0b |
grub_ssize_t pathlen;
|
|
|
f96e0b |
grub_ssize_t actual;
|
|
|
f96e0b |
+ char *tmp;
|
|
|
f96e0b |
|
|
|
f96e0b |
if (alias->path)
|
|
|
f96e0b |
{
|
|
|
f96e0b |
grub_free (alias->path);
|
|
|
f96e0b |
alias->path = 0;
|
|
|
f96e0b |
}
|
|
|
f96e0b |
- if (grub_ieee1275_next_property (alias->parent_dev, alias->name,
|
|
|
f96e0b |
+ tmp = grub_strdup (alias->name);
|
|
|
f96e0b |
+ if (grub_ieee1275_next_property (alias->parent_dev, tmp,
|
|
|
f96e0b |
alias->name) <= 0)
|
|
|
f96e0b |
{
|
|
|
f96e0b |
+ grub_free (tmp);
|
|
|
f96e0b |
grub_ieee1275_devalias_free (alias);
|
|
|
f96e0b |
return 0;
|
|
|
f96e0b |
}
|
|
|
f96e0b |
+ grub_free (tmp);
|
|
|
f96e0b |
|
|
|
f96e0b |
grub_dprintf ("devalias", "devalias name = %s\n", alias->name);
|
|
|
f96e0b |
|
|
|
f96e0b |
--
|
|
|
f96e0b |
1.8.2.1
|
|
|
f96e0b |
|