]> git.ipfire.org Git - people/ms/ipfire-3.x.git/blob - parted/patches/parted-2.1-dasd-NULL-dereference-rh563419.patch
Merge remote-tracking branch 'stevee/x-system-update'
[people/ms/ipfire-3.x.git] / parted / patches / parted-2.1-dasd-NULL-dereference-rh563419.patch
1 From 122bc980e27334d0f6243b74fffc8d2cefe0eb5c Mon Sep 17 00:00:00 2001
2 From: Hans de Goede <hdegoede@redhat.com>
3 Date: Wed, 10 Feb 2010 14:11:14 +0100
4 Subject: [PATCH parted] dasd: Fix NULL pointer dereference in dasd_read
5
6 * libparted/labels/dasd.c (dasd_read): Fix NULL ptr dereference.
7 ---
8 libparted/labels/dasd.c | 2 +-
9 1 files changed, 1 insertions(+), 1 deletions(-)
10
11 diff --git a/libparted/labels/dasd.c b/libparted/labels/dasd.c
12 index 4b5840b..516d189 100644
13 --- a/libparted/labels/dasd.c
14 +++ b/libparted/labels/dasd.c
15 @@ -399,7 +399,7 @@ dasd_read (PedDisk* disk)
16
17 if (strncmp(PART_TYPE_SWAP, str, 6) == 0) {
18 fs = ped_file_system_probe(&part->geom);
19 - if (is_linux_swap(fs->name)) {
20 + if (fs && is_linux_swap(fs->name)) {
21 dasd_data->system = PARTITION_LINUX_SWAP;
22 PDEBUG;
23 }
24 --
25 1.6.6
26