Disable linking and preloading of classes those parent or one of interface or trait is an internal class.

dstogov · dstogov · commit 4531fbf9310b · 2018-10-25T22:44:49.000+03:00
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -3238,6 +3238,10 @@ static void preload_link(void)
 					parent = zend_hash_find_ptr(EG(class_table), key);
 					zend_string_release(key);
 					if (!parent) continue;
+#ifdef ZEND_WIN32
+					/* On Windows we can't link with internal class, because of ASLR */
+					if (parent->type == ZEND_INTERNAL_CLASS) continue;
+#endif
 				}
 
 				if (ce->num_interfaces) {
@@ -3248,6 +3252,13 @@ static void preload_link(void)
 							found = 0;
 							break;
 						}
+#ifdef ZEND_WIN32
+						/* On Windows we can't link with internal class, because of ASLR */
+						if (p->type == ZEND_INTERNAL_CLASS) {
+							found = 0;
+							break;
+						}
+#endif
 					}
 					if (!found) continue;
 				}
@@ -3260,6 +3271,13 @@ static void preload_link(void)
 							found = 0;
 							break;
 						}
+#ifdef ZEND_WIN32
+						/* On Windows we can't link with internal class, because of ASLR */
+						if (p->type == ZEND_INTERNAL_CLASS) {
+							found = 0;
+							break;
+						}
+#endif
 					}
 					if (!found) continue;
 				}

Original file line number	Diff line number	Diff line change
`@@ -3238,6 +3238,10 @@ static void preload_link(void)`
`3238`	`3238`	`parent = zend_hash_find_ptr(EG(class_table), key);`
`3239`	`3239`	`zend_string_release(key);`
`3240`	`3240`	`if (!parent) continue;`
	`3241`	`+#ifdef ZEND_WIN32`
	`3242`	`+ /* On Windows we can't link with internal class, because of ASLR */`
	`3243`	`+ if (parent->type == ZEND_INTERNAL_CLASS) continue;`
	`3244`	`+#endif`
`3241`	`3245`	`}`
`3242`	`3246`
`3243`	`3247`	`if (ce->num_interfaces) {`
`@@ -3248,6 +3252,13 @@ static void preload_link(void)`
`3248`	`3252`	`found = 0;`
`3249`	`3253`	`break;`
`3250`	`3254`	`}`
	`3255`	`+#ifdef ZEND_WIN32`
	`3256`	`+ /* On Windows we can't link with internal class, because of ASLR */`
	`3257`	`+ if (p->type == ZEND_INTERNAL_CLASS) {`
	`3258`	`+ found = 0;`
	`3259`	`+ break;`
	`3260`	`+ }`
	`3261`	`+#endif`
`3251`	`3262`	`}`
`3252`	`3263`	`if (!found) continue;`
`3253`	`3264`	`}`
`@@ -3260,6 +3271,13 @@ static void preload_link(void)`
`3260`	`3271`	`found = 0;`
`3261`	`3272`	`break;`
`3262`	`3273`	`}`
	`3274`	`+#ifdef ZEND_WIN32`
	`3275`	`+ /* On Windows we can't link with internal class, because of ASLR */`
	`3276`	`+ if (p->type == ZEND_INTERNAL_CLASS) {`
	`3277`	`+ found = 0;`
	`3278`	`+ break;`
	`3279`	`+ }`
	`3280`	`+#endif`
`3263`	`3281`	`}`
`3264`	`3282`	`if (!found) continue;`
`3265`	`3283`	`}`