diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-20 10:26:45 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-20 10:26:45 +0200 |
| commit | 8e9bc90004f09a0d67fdac393a8f3fca904be397 (patch) | |
| tree | d0844e197e5b6642a51327e6693733d03ed47d3d /ext | |
| parent | cd56395d4779582506b35c11e6dcd415112113d9 (diff) | |
| parent | a230b5a6c92ce816a7d660505e883a01065e4f9e (diff) | |
| download | php-git-8e9bc90004f09a0d67fdac393a8f3fca904be397.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79497: Fix php_openssl_subtract_timeval()
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/openssl/xp_ssl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 85153b86f8..0ace22af85 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -2189,8 +2189,8 @@ static struct timeval php_openssl_subtract_timeval(struct timeval a, struct time difference.tv_usec = a.tv_usec - b.tv_usec; if (a.tv_usec < b.tv_usec) { - b.tv_sec -= 1L; - b.tv_usec += 1000000L; + difference.tv_sec -= 1L; + difference.tv_usec += 1000000L; } return difference; |