mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-16 07:58:04 +00:00
Code Issues Releases Activity

net/netatalk3: fix parsing of macOS created AppleDouble files

Browse Source 
Obtained from:	a0d2bb957b
This commit is contained in:
Joe Marcus Clarke 2024-01-02 02:48:52 -05:00
parent 1f9a228154
commit 57f92b10c3
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/netatalk3/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= netatalk
PORTVERSION= 3.1.18
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:S/./-/g}

43
net/netatalk3/files/patch-libatalk_adouble_ad__open.c Normal file
View File

@ -0,0 +1,43 @@
--- libatalk/adouble/ad_open.c.orig 2024-01-02 07:44:09 UTC
+++ libatalk/adouble/ad_open.c
@@ -668,6 +668,11 @@ reread:
int retry_read = 0;
reread:
+ if (hst == NULL) {
+ hst = &st;
+ EC_NEG1( fstat(ad_reso_fileno(ad), hst) );
+ }
+
LOG(log_debug, logtype_ad, "ad_header_read_osx: %s", path ? fullpathname(path) : "");
ad_init_old(&adosx, AD_VERSION_EA, ad->ad_options);
buf = &adosx.ad_data[0];
@@ -707,7 +712,7 @@ reread:
return -1;
}
- if (parse_entries(&adosx, nentries, header_len) != 0) {
+ if (parse_entries(&adosx, nentries, hst->st_size) != 0) {
LOG(log_warning, logtype_ad, "ad_header_read(%s): malformed AppleDouble",
path ? fullpathname(path) : "");
errno = EIO;
@@ -725,6 +730,7 @@ reread:
}
retry_read++;
if (ad_convert_osx(path, &adosx) == 1) {
+ hst = NULL;
goto reread;
}
errno = EIO;
@@ -738,11 +744,6 @@ reread:
LOG(log_error, logtype_ad, "ad_header_read_osx: problem with rfork entry offset.");
errno = EIO;
return -1;
- }
-
- if (hst == NULL) {
- hst = &st;
- EC_NEG1( fstat(ad_reso_fileno(ad), &st) );
}
ad_setentryoff(ad, ADEID_RFORK, ad_getentryoff(&adosx, ADEID_RFORK));