1.1 --- a/core/smn_events.cpp Thu Jul 18 20:34:11 2013 -0400
1.2 +++ b/core/smn_events.cpp Thu Jul 18 20:34:43 2013 -0400
1.3 @@ -124,8 +124,9 @@
1.4 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.5 HandleError err;
1.6 EventInfo *pInfo;
1.7 + HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
1.8
1.9 - if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.10 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), &sec, (void **)&pInfo))
1.11 != HandleError_None)
1.12 {
1.13 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.14 @@ -140,7 +141,6 @@
1.15 g_EventManager.FireEvent(pInfo, params[2] ? true : false);
1.16
1.17 /* Free handle on game event */
1.18 - HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
1.19 handlesys->FreeHandle(hndl, &sec);
1.20
1.21 return 1;
1.22 @@ -151,8 +151,9 @@
1.23 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.24 HandleError err;
1.25 EventInfo *pInfo;
1.26 + HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
1.27
1.28 - if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.29 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), &sec, (void **)&pInfo))
1.30 != HandleError_None)
1.31 {
1.32 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.33 @@ -167,7 +168,6 @@
1.34 g_EventManager.CancelCreatedEvent(pInfo);
1.35
1.36 /* Free handle on game event */
1.37 - HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
1.38 handlesys->FreeHandle(hndl, &sec);
1.39
1.40 return 1;
1.41 @@ -178,8 +178,9 @@
1.42 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.43 HandleError err;
1.44 EventInfo *pInfo;
1.45 + HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
1.46
1.47 - if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.48 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), &sec, (void **)&pInfo))
1.49 != HandleError_None)
1.50 {
1.51 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.52 @@ -195,8 +196,9 @@
1.53 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.54 HandleError err;
1.55 EventInfo *pInfo;
1.56 + HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
1.57
1.58 - if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.59 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), &sec, (void **)&pInfo))
1.60 != HandleError_None)
1.61 {
1.62 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.63 @@ -213,8 +215,9 @@
1.64 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.65 HandleError err;
1.66 EventInfo *pInfo;
1.67 + HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
1.68
1.69 - if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.70 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), &sec, (void **)&pInfo))
1.71 != HandleError_None)
1.72 {
1.73 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.74 @@ -231,8 +234,9 @@
1.75 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.76 HandleError err;
1.77 EventInfo *pInfo;
1.78 + HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
1.79
1.80 - if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.81 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), &sec, (void **)&pInfo))
1.82 != HandleError_None)
1.83 {
1.84 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.85 @@ -251,8 +255,9 @@
1.86 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.87 HandleError err;
1.88 EventInfo *pInfo;
1.89 + HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
1.90
1.91 - if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.92 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), &sec, (void **)&pInfo))
1.93 != HandleError_None)
1.94 {
1.95 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.96 @@ -271,8 +276,9 @@
1.97 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.98 HandleError err;
1.99 EventInfo *pInfo;
1.100 + HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
1.101
1.102 - if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.103 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), &sec, (void **)&pInfo))
1.104 != HandleError_None)
1.105 {
1.106 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.107 @@ -291,8 +297,9 @@
1.108 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.109 HandleError err;
1.110 EventInfo *pInfo;
1.111 + HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
1.112
1.113 - if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.114 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), &sec, (void **)&pInfo))
1.115 != HandleError_None)
1.116 {
1.117 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.118 @@ -311,8 +318,9 @@
1.119 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.120 HandleError err;
1.121 EventInfo *pInfo;
1.122 + HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
1.123
1.124 - if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.125 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), &sec, (void **)&pInfo))
1.126 != HandleError_None)
1.127 {
1.128 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.129 @@ -332,8 +340,9 @@
1.130 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.131 HandleError err;
1.132 EventInfo *pInfo;
1.133 + HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
1.134
1.135 - if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.136 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), &sec, (void **)&pInfo))
1.137 != HandleError_None)
1.138 {
1.139 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.140 @@ -353,8 +362,9 @@
1.141 Handle_t hndl = static_cast<Handle_t>(params[1]);
1.142 HandleError err;
1.143 EventInfo *pInfo;
1.144 + HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
1.145
1.146 - if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.147 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), &sec, (void **)&pInfo))
1.148 != HandleError_None)
1.149 {
1.150 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
