Fixed a NULL-pointer dereference on anonymous structures.

[cycript.git] / Pooling.hpp

diff --git a/Pooling.hpp b/Pooling.hpp
index 4fa5dae2972e9e2957c0357a7b0c06f1359f2573..c9076624e445abdf8d79dde80084b477bf7283cf 100644 (file)
--- a/Pooling.hpp
+++ b/Pooling.hpp
@@ -1,4 +1,4 @@
-/* Cycript - Remote Execution Server and Disassembler
+/* Cycript - Inlining/Optimizing JavaScript Compiler
  * Copyright (C) 2009  Jay Freeman (saurik)
 */
 
@@ -43,7 +43,10 @@
 #include <apr_pools.h>
 #include <apr_strings.h>
 
-#include <minimal/stdlib.h>
+#include "Exception.hpp"
+#include "Standard.hpp"
+
+#include <cstdlib>
 
 _finline void *operator new(size_t size, apr_pool_t *pool) {
     return apr_palloc(pool, size);
@@ -107,4 +110,58 @@ struct CYData {
 
 };
 
+template <typename Type_>
+struct CYPoolAllocator {
+    apr_pool_t *pool_;
+
+    typedef Type_ value_type;
+    typedef value_type *pointer;
+    typedef const value_type *const_pointer;
+    typedef value_type &reference;
+    typedef const value_type &const_reference;
+    typedef std::size_t size_type;
+    typedef std::ptrdiff_t difference_type;
+
+    CYPoolAllocator() :
+        pool_(NULL)
+    {
+    }
+
+    template <typename Right_>
+    CYPoolAllocator(const CYPoolAllocator<Right_> &rhs) :
+        pool_(rhs.pool_)
+    {
+    }
+
+    pointer allocate(size_type size, const void *hint = 0) {
+        return reinterpret_cast<pointer>(apr_palloc(pool_, size));
+    }
+
+    void deallocate(pointer data, size_type size) {
+    }
+
+    void construct(pointer address, const Type_ &rhs) {
+        new(address) Type_(rhs);
+    }
+
+    void destroy(pointer address) {
+        address->~Type_();
+    }
+
+    template <typename Right_>
+    inline bool operator==(const CYPoolAllocator<Right_> &rhs) {
+        return pool_ == rhs.pool_;
+    }
+
+    template <typename Right_>
+    inline bool operator!=(const CYPoolAllocator<Right_> &rhs) {
+        return !operator==(rhs);
+    }
+
+    template <typename Right_>
+    struct rebind {
+        typedef CYPoolAllocator<Right_> other;
+    };
+};
+
 #endif/*CYPOOLING_HPP*/