Changeset 36058 for branches/4.4/src/wp-includes/random_compat/random.php

Timestamp:

12/22/2015 03:22:05 AM (9 years ago)

Author:

dd32

Message:

Update random_compat to latest
Changes:

• Checks disable_classes for COM() before using to avoid PHP Warnings
• Uses stream_set_chunk_size() to avoid reading 8KiB from /dev/urandom unintentionally.

Merges [35922] to the 4.4 branch.

Fixes #34948.

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• src/wp-includes/random_compat/random.php (modified) (1 diff)

branches/4.4/src/wp-includes/random_compat/random.php

@@ -91 +91 @@
             class_exists('COM')
         ) {
-            try {
-                $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
-                if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
-                    // See random_bytes_com_dotnet.php
-                    require_once $RandomCompatDIR.'/random_bytes_com_dotnet.php';
+            $RandomCompat_disabled_classes = preg_split(
+                '#\s*,\s*#', 
+                strtolower(ini_get('disable_classes'))
+            );
+            
+            if (!in_array('com', $RandomCompat_disabled_classes)) {
+                try {
+                    $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
+                    if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
+                        // See random_bytes_com_dotnet.php
+                        require_once $RandomCompatDIR.'/random_bytes_com_dotnet.php';
+                    }
+                } catch (com_exception $e) {
+                    // Don't try to use it.
                 }
-            } catch (com_exception $e) {
-                // Don't try to use it.
             }
+            $RandomCompat_disabled_classes = null;
             $RandomCompatCOMtest = null;
         }