diff --git a/NEWS b/NEWS
index 4394eb581ea..562990e2148 100644
--- a/NEWS
+++ b/NEWS
@@ -39,6 +39,8 @@ PHP                                                                        NEWS
   . Fix file descriptor/memory leak when opening central fp fails. (nielsdos)
   . Fix memleak+UAF when opening temp stream in buildFromDirectory() fails.
     (nielsdos)
+  . Fix potential buffer length truncation due to usage of type int instead
+    of type size_t. (Girgias)
 
 - Random:
   . Fix Randomizer::__serialize() w.r.t. INDIRECTs. (nielsdos)
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 7650478cbca..de4d14bf7cd 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -1592,7 +1592,7 @@ zend_result phar_open_from_filename(char *fname, size_t fname_len, char *alias,
 }
 /* }}}*/
 
-static inline char *phar_strnstr(const char *buf, int buf_len, const char *search, int search_len) /* {{{ */
+static inline char *phar_strnstr(const char *buf, size_t buf_len, const char *search, size_t search_len) /* {{{ */
 {
 	const char *c;
 	ptrdiff_t so_far = 0;
diff --git a/ext/phar/stream.c b/ext/phar/stream.c
index db89bd6c6c9..41f1ed9c0dd 100644
--- a/ext/phar/stream.c
+++ b/ext/phar/stream.c
@@ -670,7 +670,7 @@ static int phar_wrapper_unlink(php_stream_wrapper *wrapper, const char *url, int
 {
 	php_url *resource;
 	char *internal_file, *error;
-	int internal_file_len;
+	size_t internal_file_len;
 	phar_entry_data *idata;
 	phar_archive_data *pphar;