b7125dc640
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/parted.git#633c371306f0da38c70879e948b612775032740a
76 lines
2.9 KiB
Diff
76 lines
2.9 KiB
Diff
From 6cb1ed79543f9a9425de2b334a41e08836edc6b8 Mon Sep 17 00:00:00 2001
|
|
From: "Brian C. Lane" <bcl@redhat.com>
|
|
Date: Tue, 10 Nov 2020 17:05:59 -0800
|
|
Subject: [PATCH 28/42] hfs/advfs_plus: Fix gcc 10 warnings about cast
|
|
alignment
|
|
|
|
---
|
|
libparted/fs/r/hfs/advfs_plus.c | 22 ++++++++++++----------
|
|
1 file changed, 12 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/libparted/fs/r/hfs/advfs_plus.c b/libparted/fs/r/hfs/advfs_plus.c
|
|
index 2b6fd87..2141746 100644
|
|
--- a/libparted/fs/r/hfs/advfs_plus.c
|
|
+++ b/libparted/fs/r/hfs/advfs_plus.c
|
|
@@ -80,6 +80,7 @@ hfsplus_btree_search (HfsPPrivateFile* b_tree_file, HfsPPrivateGenericKey* key,
|
|
HfsPPrivateGenericKey* record_key = NULL;
|
|
unsigned int node_number, record_number, size, bsize;
|
|
int i;
|
|
+ uint16_t record_pos;
|
|
|
|
/* Read the header node */
|
|
if (!hfsplus_file_read_sector(b_tree_file, node_1, 0))
|
|
@@ -93,7 +94,7 @@ hfsplus_btree_search (HfsPPrivateFile* b_tree_file, HfsPPrivateGenericKey* key,
|
|
|
|
/* Get the size of a node in sectors and allocate buffer */
|
|
size = (bsize = PED_BE16_TO_CPU (header->node_size)) / PED_SECTOR_SIZE_DEFAULT;
|
|
- node = (uint8_t*) ped_malloc (bsize);
|
|
+ node = ped_malloc (bsize);
|
|
if (!node)
|
|
return 0;
|
|
HfsPNodeDescriptor *desc = (HfsPNodeDescriptor*) node;
|
|
@@ -107,13 +108,13 @@ hfsplus_btree_search (HfsPPrivateFile* b_tree_file, HfsPPrivateGenericKey* key,
|
|
while (1) {
|
|
record_number = PED_BE16_TO_CPU (desc->rec_nb);
|
|
for (i = record_number; i; i--) {
|
|
- record_key = (HfsPPrivateGenericKey*)
|
|
- (node + PED_BE16_TO_CPU(*((uint16_t *)
|
|
- (node+(bsize - 2*i)))));
|
|
+ uint16_t value;
|
|
+ memcpy(&value, node+(bsize - (2*i)), sizeof(uint16_t));
|
|
+ record_pos = PED_BE16_TO_CPU(value);
|
|
+ record_key = (HfsPPrivateGenericKey*) (node + record_pos);
|
|
/* check for obvious error in FS */
|
|
- if (((uint8_t*)record_key - node < HFS_FIRST_REC)
|
|
- || ((uint8_t*)record_key - node
|
|
- >= (signed)bsize
|
|
+ if ((record_pos < HFS_FIRST_REC)
|
|
+ || (record_pos >= (signed)bsize
|
|
- 2 * (signed)(record_number+1))) {
|
|
ped_exception_throw (
|
|
PED_EXCEPTION_ERROR,
|
|
@@ -131,8 +132,9 @@ hfsplus_btree_search (HfsPPrivateFile* b_tree_file, HfsPPrivateGenericKey* key,
|
|
|
|
skip = ( 2 + PED_BE16_TO_CPU (record_key->key_length)
|
|
+ 1 ) & ~1;
|
|
- node_number = PED_BE32_TO_CPU (*((uint32_t *)
|
|
- (((uint8_t *) record_key) + skip)));
|
|
+ uint32_t value;
|
|
+ memcpy(&value, node+record_pos+skip, sizeof(uint32_t));
|
|
+ node_number = PED_BE32_TO_CPU(value);
|
|
if (!hfsplus_file_read(b_tree_file, node,
|
|
(PedSector) node_number * size,
|
|
size)) {
|
|
@@ -151,7 +153,7 @@ hfsplus_btree_search (HfsPPrivateFile* b_tree_file, HfsPPrivateGenericKey* key,
|
|
if (record_ref) {
|
|
record_ref->node_size = size; /* in sectors */
|
|
record_ref->node_number = node_number;
|
|
- record_ref->record_pos = (uint8_t*)record_key - node;
|
|
+ record_ref->record_pos = record_pos;
|
|
record_ref->record_number = i;
|
|
}
|
|
|
|
--
|
|
2.26.2
|
|
|