From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 4 May 2020 21:10:17 +0000 (+0200)
Subject: Remove persistent allocators from libmbfl
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d4ff8443ecce572ad7d406cc1a3bbf74cadaf9b;p=php

Remove persistent allocators from libmbfl

These functions are not used, and I don't think we have any plans
to ever use them.
---

diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
index 08fc275d04..5caf25097e 100644
--- a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
@@ -39,9 +39,6 @@ typedef struct _mbfl_allocators {
 	void *(*realloc)(void *, size_t);
 	void *(*calloc)(size_t, size_t);
 	void (*free)(void *);
-	void *(*pmalloc)(size_t);
-	void *(*prealloc)(void *, size_t);
-	void (*pfree)(void *);
 } mbfl_allocators;
 
 MBFLAPI extern mbfl_allocators *__mbfl_allocators;
@@ -50,8 +47,5 @@ MBFLAPI extern mbfl_allocators *__mbfl_allocators;
 #define mbfl_realloc (__mbfl_allocators->realloc)
 #define mbfl_calloc (__mbfl_allocators->calloc)
 #define mbfl_free (__mbfl_allocators->free)
-#define mbfl_pmalloc (__mbfl_allocators->pmalloc)
-#define mbfl_prealloc (__mbfl_allocators->preallloc)
-#define mbfl_pfree (__mbfl_allocators->pfree)
 
 #endif /* MBFL_ALLOCATORS_H */
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 652027f4c5..f636d51b02 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -237,29 +237,11 @@ static void _php_mb_allocators_free(void *ptr)
 	efree(ptr);
 }
 
-static void *_php_mb_allocators_pmalloc(size_t sz)
-{
-	return pemalloc(sz, 1);
-}
-
-static void *_php_mb_allocators_prealloc(void *ptr, size_t sz)
-{
-	return perealloc(ptr, sz, 1);
-}
-
-static void _php_mb_allocators_pfree(void *ptr)
-{
-	pefree(ptr, 1);
-}
-
 static const mbfl_allocators _php_mb_allocators = {
 	_php_mb_allocators_malloc,
 	_php_mb_allocators_realloc,
 	_php_mb_allocators_calloc,
 	_php_mb_allocators_free,
-	_php_mb_allocators_pmalloc,
-	_php_mb_allocators_prealloc,
-	_php_mb_allocators_pfree
 };
 /* }}} */