Merge branch 'PHP-7.3' into PHP-7.4
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 23 May 2019 11:41:17 +0000 (13:41 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 23 May 2019 11:41:17 +0000 (13:41 +0200)
1  2 
Zend/zend_arena.h
ext/mysqlnd/mysqlnd_result.c

index a27d00d34549c5d25c9bebefb706adbc38b63f1e,604285fc97e2fd292f23e7829e4ec286c091872d..a469616592c429a24583bdd3c1a2e591ff6a1c9b
@@@ -110,4 -110,25 +110,15 @@@ static zend_always_inline void zend_are
        arena->ptr = (char*)checkpoint;
  }
  
+ static zend_always_inline zend_bool zend_arena_contains(zend_arena *arena, void *ptr)
+ {
+       while (arena) {
+               if ((char*)ptr > (char*)arena && (char*)ptr <= arena->ptr) {
+                       return 1;
+               }
+               arena = arena->prev;
+       }
+       return 0;
+ }
  #endif /* _ZEND_ARENA_H_ */
 -
 -/*
 - * Local variables:
 - * tab-width: 4
 - * c-basic-offset: 4
 - * indent-tabs-mode: t
 - * End:
 - * vim600: sw=4 ts=4 fdm=marker
 - * vim<600: sw=4 ts=4
 - */
Simple merge