From bbf0c65cdeeef3f82d0533d356fd756232c4e4a7 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Mon, 13 May 2024 19:47:35 +0200 Subject: Revert "Use updated libplist 2.5.0 API" This reverts commit e61817ae57aac7252499268a9276692a32dc3e01. --- configure.ac | 2 +- src/opack.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index eae80e8..6059128 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ if test -z $PACKAGE_VERSION; then fi dnl Minimum package versions -LIBPLIST_VERSION=2.5.0 +LIBPLIST_VERSION=2.3.0 AC_SUBST(LIBIMOBILEDEVICE_GLUE_SO_VERSION) AC_SUBST(LIBPLIST_VERSION) diff --git a/src/opack.c b/src/opack.c index 8f6ddfa..8a9264a 100644 --- a/src/opack.c +++ b/src/opack.c @@ -199,7 +199,7 @@ static void opack_encode_node(plist_t node, struct char_buf* cbuf) } break; case PLIST_DATA: { uint64_t len = 0; - const uint8_t* data = plist_get_data_ptr(node, &len); + const char* data = plist_get_data_ptr(node, &len); if (len > 0x20) { if (len > 0xFF) { if (len > 0xFFFF) { @@ -379,7 +379,7 @@ static int opack_decode_obj(unsigned char** p, unsigned char* end, plist_t* plis *p = end; return -1; } - *plist_out = plist_new_data(*p, dlen); + *plist_out = plist_new_data((const char*)*p, dlen); (*p)+=dlen; } else if (type >= 0xE0 && type <= 0xEF) { /* dictionary */ -- cgit v1.1-32-gdbae