chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Script: Fixed NULL dereference in some cases

Browse Source 
http://rainmeter.net/forum/viewtopic.php?f=14&t=13251
This commit is contained in:
Birunthan Mohanathas
2012-09-02 10:26:09 +03:00
parent c9bf2f131d
commit 0f97ddf497
3 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Library/lua/glue/LuaMeasure.cpp
View File

@ -21,14 +21,14 @@
#include "../../Measure.h"
#include "../../MeterWindow.h"
inline CMeasure* GetSelf(lua_State* L)
{
return *(CMeasure**)lua_touserdata(L, 1);
}
#define DECLARE_SELF(L) \
void* selfData = lua_touserdata(L, 1); \
if (!selfData) return 0; \
CMeasure* self = *(CMeasure**)selfData;
static int GetName(lua_State* L)
{
CMeasure* self = GetSelf(L);
DECLARE_SELF(L)
LuaManager::PushWide(L, self->GetName());
return 1;
@ -36,7 +36,7 @@ static int GetName(lua_State* L)
static int GetOption(lua_State* L)
{
CMeasure* self = GetSelf(L);
DECLARE_SELF(L)
CMeterWindow* meterWindow = self->GetMeterWindow();
CConfigParser& parser = meterWindow->GetParser();
@ -49,7 +49,7 @@ static int GetOption(lua_State* L)
static int GetNumberOption(lua_State* L)
{
CMeasure* self = GetSelf(L);
DECLARE_SELF(L)
CMeterWindow* meterWindow = self->GetMeterWindow();
CConfigParser& parser = meterWindow->GetParser();
@ -62,7 +62,7 @@ static int GetNumberOption(lua_State* L)
static int Disable(lua_State* L)
{
CMeasure* self = GetSelf(L);
DECLARE_SELF(L)
self->Disable();
return 0;
@ -70,7 +70,7 @@ static int Disable(lua_State* L)
static int Enable(lua_State* L)
{
CMeasure* self = GetSelf(L);
DECLARE_SELF(L)
self->Enable();
return 0;
@ -78,7 +78,7 @@ static int Enable(lua_State* L)
static int GetValue(lua_State* L)
{
CMeasure* self = GetSelf(L);
DECLARE_SELF(L)
lua_pushnumber(L, self->GetValue());
return 1;
@ -86,7 +86,7 @@ static int GetValue(lua_State* L)
static int GetRelativeValue(lua_State* L)
{
CMeasure* self = GetSelf(L);
DECLARE_SELF(L)
lua_pushnumber(L, self->GetRelativeValue());
return 1;
@ -94,7 +94,7 @@ static int GetRelativeValue(lua_State* L)
static int GetValueRange(lua_State* L)
{
CMeasure* self = GetSelf(L);
DECLARE_SELF(L)
lua_pushnumber(L, self->GetValueRange());
return 1;
@ -102,7 +102,7 @@ static int GetValueRange(lua_State* L)
static int GetMinValue(lua_State* L)
{
CMeasure* self = GetSelf(L);
DECLARE_SELF(L)
lua_pushnumber(L, self->GetMinValue());
return 1;
@ -110,7 +110,7 @@ static int GetMinValue(lua_State* L)
static int GetMaxValue(lua_State* L)
{
CMeasure* self = GetSelf(L);
DECLARE_SELF(L)
lua_pushnumber(L, self->GetMaxValue());
return 1;
@ -118,7 +118,7 @@ static int GetMaxValue(lua_State* L)
static int GetStringValue(lua_State* L)
{
CMeasure* self = GetSelf(L);
DECLARE_SELF(L)
int top = lua_gettop(L);
AUTOSCALE autoScale = (top > 1) ? (AUTOSCALE)(int)lua_tonumber(L, 2) : AUTOSCALE_OFF;