MFB: Fixed bug #48313 (fgetcsv() does not return null for empty rows)

diff --git a/NEWS b/NEWS
index 4ae3c6c1476689302f9df5c5e6543d272731ff0a..bc8d1edf4e19ca478d333a8780d13e96202d47c5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ PHP                                                                        NEWS
 - Fixed segfault on invalid session.save_path. (Hannes)
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
 
+- Fixed bug #48313 (fgetcsv() does not return null for empty rows). (Ilia)
 - Fixed bug #48309 (stream_copy_to_stream() and fpasstru() do not update stream
   position of plain files). (Arnaud)
 - Fixed bug #48307 (stream_copy_to_stream() copies 0 bytes when $source is a 

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 25887fd8a65e3d350cce91ea256a4f81993cde4d..21870c3d329e6627b2666ccd5641ce47d35c2c74 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -2384,8 +2384,12 @@ PHPAPI void php_fgetcsv(php_stream *stream, char delimiter, char enclosure, size
                }
 
                /* 3. Now pass our field back to php */
-               *comp_end = '\0';
-               add_next_index_stringl(return_value, temp, comp_end - temp, 1);
+               if (comp_end - temp) {
+                       *comp_end = '\0';
+                       add_next_index_stringl(return_value, temp, comp_end - temp, 1);
+               } else {
+                       add_next_index_null(return_value);
+               }
        } while (inc_len > 0);
 
 out: