Merge remote-tracking branch 'mpg123/master' into master-with-github-ci

madebr · Feb 5, 2024 · 4221364 · 4221364
2 parents c2b5c82 + 820e1db
commit 4221364
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -6,6 +6,7 @@
 - libmpg123:
 -- Also avoid indirect branches for builds with a single CPU optmization
    (no OPT_MULTI) by actually using the wrappers in that case (bug 367).
+-- Fix --enable-portable (no usage of LFS_WRAP_NONE, bug 368).
 
 1.32.4
 ------

diff --git a/src/libmpg123/libmpg123.c b/src/libmpg123/libmpg123.c
@@ -648,9 +648,10 @@ int attribute_align_arg mpg123_open_handle(mpg123_handle *mh, void *iohandle)
 #ifndef PORTABLE_API
 	ret = INT123_wrap_open( mh, iohandle, NULL, -1
 	,	mh->p.timeout, mh->p.flags & MPG123_QUIET );
+	iohandle = ret == LFS_WRAP_NONE ? iohandle : mh->wrapperdata;
 	if(ret >= 0)
 #endif
-		ret = INT123_open_stream_handle(mh, ret == LFS_WRAP_NONE ? iohandle : mh->wrapperdata);
+		ret = INT123_open_stream_handle(mh, iohandle);
 	return ret;
 }