Merge branch 'PHP-7.4'

nikic · nikic · commit 8e9bc90004f0 · 2020-04-20T10:26:45.000+02:00
* PHP-7.4:
  Fix #79497: Fix php_openssl_subtract_timeval()
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -2189,8 +2189,8 @@ static struct timeval php_openssl_subtract_timeval(struct timeval a, struct time`
`2189`	`2189`	`difference.tv_usec = a.tv_usec - b.tv_usec;`
`2190`	`2190`
`2191`	`2191`	`if (a.tv_usec < b.tv_usec) {`
`2192`		`- b.tv_sec -= 1L;`
`2193`		`- b.tv_usec += 1000000L;`
	`2192`	`+ difference.tv_sec -= 1L;`
	`2193`	`+ difference.tv_usec += 1000000L;`
`2194`	`2194`	`}`
`2195`	`2195`
`2196`	`2196`	`return difference;`