MFH: - Fixed bug #31684 (dio_tcsetattr(): misconfigured termios settings)

diff --git a/NEWS b/NEWS
index ffe49b251042bfdfc2dc473c62406557aebee0a7..c6fd9eeca7956cdfdd7b72090f6fe508cfa281d7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,8 @@ PHP                                                                        NEWS
 - Changed phpize not to require libtool. (Jani)
 - Fixed build system to always use bundled libtool files. (Jani)
 - Fixed a bug in mysqli_stmt_execute() (type conversion with NULL values). (Georg)
+- Fixed bug #31684 (dio_tcsetattr(): misconfigured termios settings).
+  (elod at itfais dot com)
 - Fixed bug #31651 (ReflectionClass::getDefaultProperties segfaults with arrays).
   (Marcus)
 - Fixed bug #31623 (OCILogin does not support password grace period).

diff --git a/ext/dio/dio.c b/ext/dio/dio.c
index 2542859eaeb617154cc8aea61111293deb0d1427..0435957f05552f8f926d3531c71efdb1b26561dc 100644 (file)
--- a/ext/dio/dio.c
+++ b/ext/dio/dio.c
@@ -611,6 +611,8 @@ PHP_FUNCTION(dio_tcsetattr)
                        RETURN_FALSE;
        }   
 
+       memset(&newtio, 0, sizeof(newtio));
+       tcgetattr(f->fd, &newtio);
        newtio.c_cflag = BAUD | CRTSCTS | DATABITS | STOPBITS | PARITYON | PARITY | CLOCAL | CREAD;
        newtio.c_iflag = IGNPAR;
        newtio.c_oflag = 0;