From 393b64580b99cbca00d7ea752b56708b3f9f6979 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 13 Oct 2023 10:11:23 +0200
Subject: fix stack smashing on 32-bit

---
 package.xml |  2 +-
 rpminfo.c   | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/package.xml b/package.xml
index 87f4c2b..0883ab2 100644
--- a/package.xml
+++ b/package.xml
@@ -24,7 +24,7 @@ Documentation: https://www.php.net/rpminfo
   </stability>
   <license uri="https://www.php.net/license/3_01.txt" filesource="LICENSE">PHP-3.01</license>
   <notes>
--
+- fix stack smashing on 32-bit
   </notes>
   <contents>
     <dir name="/">
diff --git a/rpminfo.c b/rpminfo.c
index 70676f7..7eb992e 100644
--- a/rpminfo.c
+++ b/rpminfo.c
@@ -618,7 +618,11 @@ static int php_zip_ops_stat(php_stream *stream, php_stream_statbuf *ssb)
 	STREAM_DATA_FROM_STREAM();
 
 	if (self) {
-		 return rpmfiStat(self->fi, 0, &ssb->sb);
+		struct stat s[2]; // librpm may use different size (32-bit)
+		int rc;
+		rc = rpmfiStat(self->fi, 0, s);
+		memcpy(&ssb->sb, s, sizeof(ssb->sb));
+		return rc;
 	}
 	return -1;
 }
@@ -761,7 +765,9 @@ static int php_stream_rpm_stat(php_stream_wrapper *wrapper, const char *url, int
 
 	self = php_stream_rpm_finder(url);
 	if (self) {
-		rc = rpmfiStat(self->fi, 0, &ssb->sb);
+		struct stat s[2]; // librpm may use different size (32-bit)
+		rc = rpmfiStat(self->fi, 0, s);
+		memcpy(&ssb->sb, s, sizeof(ssb->sb));
 		php_rpm_ops_free(self, 1);
 	}
 
-- 
cgit