File a959668782dafbfe469994b14d9c3adaef4e1c34.patch of Package casync

Overview Repositories Revisions Requests Users Attributes Meta

File a959668782dafbfe469994b14d9c3adaef4e1c34.patch of Package casync (Revision a80920a19a588635339a8e38c355cc86)

Currently displaying revision a80920a19a588635339a8e38c355cc86 , Show latest

From a959668782dafbfe469994b14d9c3adaef4e1c34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 22 Jun 2017 20:31:09 +0000
Subject: [PATCH] Add two forgotten endianness conversions in decoding

This allows tests to pass on ppc64be and fixes #27.
---
 src/cadecoder.c | 5 +++--
 src/caindex.c   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/cadecoder.c b/src/cadecoder.c
index 67654c0..b9afb1c 100644
--- a/src/cadecoder.c
+++ b/src/cadecoder.c
@@ -1579,7 +1579,7 @@ static int ca_decoder_parse_entry(CaDecoder *d, CaDecoderNode *n) {
         sz = realloc_buffer_size(&d->buffer);
         for (;;) {
                 const CaFormatHeader *h;
-                uint64_t t, l;
+                uint64_t t, l, flags;
 
                 if (sz < sizeof(CaFormatHeader)) /* Not read enough yet */
                         return CA_DECODER_REQUEST;
@@ -1618,7 +1618,8 @@ static int ca_decoder_parse_entry(CaDecoder *d, CaDecoderNode *n) {
                                 return -EBADMSG;
 
                         /* Is this file too new for us? */
-                        if ((entry->feature_flags & ~CA_FORMAT_FEATURE_FLAGS_MAX) != 0)
+                        flags = read_le64(&entry->feature_flags);
+                        if ((flags & ~CA_FORMAT_FEATURE_FLAGS_MAX) != 0)
                                 return -EPROTONOSUPPORT;
 
                         offset += l;
diff --git a/src/caindex.c b/src/caindex.c
index 7ab8ca8..25d4982 100644
--- a/src/caindex.c
+++ b/src/caindex.c
@@ -238,7 +238,7 @@ static int ca_index_write_head(CaIndex *i) {
                 CaFormatIndex index;
                 CaFormatHeader table;
         } head = {
-                .index.header.size = sizeof(CaFormatIndex),
+                .index.header.size = htole64(sizeof(CaFormatIndex)),
                 .index.header.type = htole64(CA_FORMAT_INDEX),
                 .table.size = htole64(UINT64_MAX),
                 .table.type = htole64(CA_FORMAT_TABLE),

Places

File a959668782dafbfe469994b14d9c3adaef4e1c34.patch of Package casync (Revision a80920a19a588635339a8e38c355cc86)

Places