Skip to content

Commit 19da1ce

Browse files
committed
GlobalIdGenerator: Update str_getcsv() call for PHP 8.4
Bug: T378304 Change-Id: Id9db937c82de650acf088bb7ebb8c5be66a625f2
1 parent 817eabb commit 19da1ce

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

includes/libs/uuid/GlobalIdGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ private function load() {
662662
// https://technet.microsoft.com/en-us/library/bb490913.aspx
663663
$csv = trim( ( $this->shellCallback )( 'getmac /NH /FO CSV' ) );
664664
$line = substr( $csv, 0, strcspn( $csv, "\n" ) );
665-
$info = str_getcsv( $line );
665+
$info = str_getcsv( $line, ",", "\"", "\\" );
666666
// @phan-suppress-next-line PhanTypeMismatchArgumentNullableInternal False positive
667667
$nodeId = isset( $info[0] ) ? str_replace( '-', '', $info[0] ) : '';
668668
} elseif ( is_executable( '/sbin/ifconfig' ) ) {

0 commit comments

Comments
 (0)