Projects
Essentials
lightspark
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 110
View file
lightspark.spec
Changed
@@ -20,14 +20,13 @@ %bcond_without librtmp Name: lightspark -Version: 0.7.2.99+git20160604.1811 +Version: 0.7.2.99+git20160612.1717 Release: 0 Summary: Modern, free, open-source flash player implementation License: LGPL-3.0+ Group: Productivity/Multimedia/Other Url: https://launchpad.net/lightspark/ Source0: lightspark.tar.xz -Source1: 0001-Fix-LOG_CALL-macro.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: desktop-file-utils @@ -86,7 +85,6 @@ %prep %setup -q -n %{name} -patch --merge -p1 < %{S:1} %build export CFLAGS='%{optflags}'
View file
0001-Fix-LOG_CALL-macro.patch
Deleted
@@ -1,25 +0,0 @@ -From 44a1aa3548c101d8d7620295c758bda1145b32f5 Mon Sep 17 00:00:00 2001 -From: Johannes Obermayr <johannesobermayr@gmx.de> -Date: Sun, 5 Jun 2016 19:15:15 +0200 -Subject: [PATCH] Fix LOG_CALL macro. - ---- - src/logger.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/logger.h b/src/logger.h -index 30e2483..72eff0e 100644 ---- a/src/logger.h -+++ b/src/logger.h -@@ -36,7 +36,7 @@ enum LOG_LEVEL { LOG_ERROR=0, LOG_INFO=1, LOG_NOT_IMPLEMENTED=2,LOG_CALLS=3,LOG_ - do { \ - if(LOG_CALLS<=Log::getLevel()) \ - { \ -- Log l(level); \ -+ Log l(LOG_CALLS); \ - l() << esp << std::endl; \ - } \ - } while(0) --- -2.8.3 -
View file
lightspark.tar.xz/src/logger.h
Changed
@@ -36,7 +36,7 @@ do { \ if(LOG_CALLS<=Log::getLevel()) \ { \ - Log l(level); \ + Log l(LOG_CALLS); \ l() << esp << std::endl; \ } \ } while(0)
View file
lightspark.tar.xz/src/scripting/abc_interpreter.cpp
Changed
@@ -484,8 +484,8 @@ { //nextvalue ASObject* v1=context->runtime_stack_pop(); - ASObject* v2=context->runtime_stack_pop(); - context->runtime_stack_push(nextValue(v1,v2)); + ASObject** pval=context->runtime_stack_pointer(); + *pval=nextValue(v1,*pval); break; } case 0x24: @@ -1084,9 +1084,8 @@ { //getslot uint32_t t = code.readu30(); - ASObject* obj=context->runtime_stack_pop(); - ASObject* ret=getSlot(obj, t); - context->runtime_stack_push(ret); + ASObject** pval=context->runtime_stack_pointer(); + *pval=getSlot(*pval, t); break; } case 0x6d: @@ -1121,63 +1120,52 @@ case 0x70: { //convert_s - ASObject* val=context->runtime_stack_pop(); - context->runtime_stack_push(convert_s(val)); + ASObject** pval=context->runtime_stack_pointer(); + *pval=convert_s(*pval); break; } case 0x71: { - ASObject* val=context->runtime_stack_pop(); - context->runtime_stack_push(esc_xelem(val)); + ASObject** pval=context->runtime_stack_pointer(); + *pval = esc_xelem(*pval); break; } case 0x72: { - ASObject* val=context->runtime_stack_pop(); - context->runtime_stack_push(esc_xattr(val)); + ASObject** pval=context->runtime_stack_pointer(); + *pval = esc_xattr(*pval); break; }case 0x73: { //convert_i - ASObject* val=context->runtime_stack_peek(); - if (!val || !val->is<Integer>()) - { - context->runtime_stack_pop(); - context->runtime_stack_push(abstract_i(function->getSystemState(),convert_i(val))); - } + ASObject** pval=context->runtime_stack_pointer(); + if (!(*pval)->is<Integer>()) + *pval = abstract_i(function->getSystemState(),convert_i(*pval)); break; } case 0x74: { //convert_u - ASObject* val=context->runtime_stack_peek(); - if (!val || !val->is<UInteger>()) - { - context->runtime_stack_pop(); - context->runtime_stack_push(abstract_ui(function->getSystemState(),convert_u(val))); - } + ASObject** pval=context->runtime_stack_pointer(); + if (!(*pval)->is<UInteger>()) + *pval = abstract_ui(function->getSystemState(),convert_u(*pval)); break; } case 0x75: { //convert_d - ASObject* val=context->runtime_stack_peek(); - if (!val) - context->runtime_stack_pop(); // force exception - switch (val->getObjectType()) + ASObject** pval=context->runtime_stack_pointer(); + switch ((*pval)->getObjectType()) { case T_INTEGER: case T_BOOLEAN: case T_UINTEGER: - val =context->runtime_stack_pop(); - - context->runtime_stack_push(abstract_di(function->getSystemState(),convert_di(val))); + *pval = abstract_di(function->getSystemState(),convert_di(*pval)); break; case T_NUMBER: break; default: - val =context->runtime_stack_pop(); - context->runtime_stack_push(abstract_d(function->getSystemState(),convert_d(val))); + *pval = abstract_d(function->getSystemState(),convert_d(*pval)); break; } break; @@ -1185,29 +1173,22 @@ case 0x76: { //convert_b - ASObject* val=context->runtime_stack_peek(); - if (!val || !val->is<Boolean>()) - { - context->runtime_stack_pop(); - context->runtime_stack_push(abstract_b(function->getSystemState(),convert_b(val))); - } + ASObject** pval=context->runtime_stack_pointer(); + if (!(*pval)->is<Boolean>()) + *pval = abstract_b(function->getSystemState(),convert_b(*pval)); break; } case 0x77: { //convert_o - ASObject* val=context->runtime_stack_peek(); - if (!val) - context->runtime_stack_pop(); // force exception - if (val->is<Null>()) + ASObject** pval=context->runtime_stack_pointer(); + if ((*pval)->is<Null>()) { - context->runtime_stack_pop(); LOG(LOG_ERROR,"trying to call convert_o on null"); throwError<TypeError>(kConvertNullToObjectError); } - if (val->is<Undefined>()) + if ((*pval)->is<Undefined>()) { - context->runtime_stack_pop(); LOG(LOG_ERROR,"trying to call convert_o on undefined"); throwError<TypeError>(kConvertUndefinedToObjectError); } @@ -1216,8 +1197,8 @@ case 0x78: { //checkfilter - ASObject* val=context->runtime_stack_pop(); - context->runtime_stack_push(checkfilter(val)); + ASObject** pval=context->runtime_stack_pointer(); + *pval=checkfilter(*pval); break; } case 0x80: @@ -1236,11 +1217,9 @@ case 0x85: { //coerce_s - ASObject* val=context->runtime_stack_pop(); - if (val->is<ASString>()) - context->runtime_stack_push(val); - else - context->runtime_stack_push(coerce_s(val)); + ASObject** pval=context->runtime_stack_pointer(); + if (!(*pval)->is<ASString>()) + *pval = coerce_s(*pval); break; } case 0x86: @@ -1249,44 +1228,36 @@ uint32_t t = code.readu30(); multiname* name=context->context->getMultiname(t,NULL); - ASObject* v1=context->runtime_stack_pop(); - - ASObject* ret=asType(context->context, v1, name); - context->runtime_stack_push(ret); + ASObject** pval=context->runtime_stack_pointer(); + *pval=asType(context->context, *pval, name); break; } case 0x87: { //astypelate ASObject* v1=context->runtime_stack_pop(); - ASObject* v2=context->runtime_stack_pop(); - - ASObject* ret=asTypelate(v1, v2); - context->runtime_stack_push(ret); + ASObject** pval=context->runtime_stack_pointer(); + *pval=asTypelate(v1, *pval); break; } case 0x90: { //negate - ASObject* val=context->runtime_stack_pop(); - ASObject* ret; - if ((val->is<Integer>() || val->is<UInteger>() || (val->is<Number>() && !val->as<Number>()->isfloat)) && val->toInt64() != 0 && val->toInt64() == val->toInt()) - ret=abstract_di(function->getSystemState(),negate_i(val)); + ASObject** pval=context->runtime_stack_pointer(); + if (((*pval)->is<Integer>() || (*pval)->is<UInteger>() || ((*pval)->is<Number>() && !(*pval)->as<Number>()->isfloat)) && (*pval)->toInt64() != 0 && (*pval)->toInt64() == (*pval)->toInt()) + *pval=abstract_di(function->getSystemState(),negate_i(*pval)); else
View file
lightspark.tar.xz/src/scripting/abcutils.h
Changed
@@ -102,6 +102,14 @@ LOG(LOG_ERROR,_("Empty stack")); return NULL; } + inline ASObject** runtime_stack_pointer() + { + if(stack_index) + return &stack[stack_index-1]; + else + handleError(kStackUnderflowError); + return NULL; + } }; }
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.