Found a memory management mistake (new Instance should not be transient) while workin...

[cycript.git] / Exception.hpp

diff --git a/Exception.hpp b/Exception.hpp
index a3be1a8db0459ac2be55d0e85624eedd122bf5eb..286fdeb3fc7ba44a29983ef34b2746a55eb1e0dc 100644 (file)
--- a/Exception.hpp
+++ b/Exception.hpp
@@ -1,4 +1,4 @@
-/* Cycript - Error.hppution Server and Disassembler
+/* Cycript - Inlining/Optimizing JavaScript Compiler
  * Copyright (C) 2009  Jay Freeman (saurik)
 */
 
@@ -40,17 +40,28 @@
 #ifndef CYCRIPT_EXCEPTION_HPP
 #define CYCRIPT_EXCEPTION_HPP
 
+#ifdef CY_EXECUTE
 #include <JavaScriptCore/JSBase.h>
+#endif
 
+#include <apr_pools.h>
 #include "Standard.hpp"
 
 struct CYException {
+    virtual ~CYException() {
+    }
+
     virtual const char *PoolCString(apr_pool_t *pool) const = 0;
+#ifdef CY_EXECUTE
     virtual JSValueRef CastJSValue(JSContextRef context) const = 0;
+#endif
 };
 
 void CYThrow(const char *format, ...) _noreturn;
+
+#ifdef CY_EXECUTE
 void CYThrow(JSContextRef context, JSValueRef value);
+#endif
 
 #define CYTry \
     try
@@ -63,6 +74,8 @@ void CYThrow(JSContextRef context, JSValueRef value);
         return NULL; \
     }
 
+// XXX: fix this: _ is not safe; this is /not/ Menes ;P
+#undef _assert
 #define _assert(test, args...) do { \
     if (!(test)) \
         CYThrow("*** _assert(%s):%s(%u):%s [errno=%d]", #test, __FILE__, __LINE__, __FUNCTION__, errno); \
@@ -91,6 +104,12 @@ void CYThrow(JSContextRef context, JSValueRef value);
         _assert(_aprstatus == APR_SUCCESS); \
     } while (false)
 
+#define _krncall(expr) \
+    do { \
+        kern_return_t _krnstatus((expr)); \
+        _assert(_krnstatus == KERN_SUCCESS); \
+    } while (false)
+
 #define _sqlcall(expr) ({ \
     __typeof__(expr) _value = (expr); \
     if (_value != 0 && (_value < 100 || _value >= 200)) \