[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/swf/ASHandlers.cpp
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog server/swf/ASHandlers.cpp |
Date: |
Sat, 02 Sep 2006 12:27:15 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 06/09/02 12:27:15
Modified files:
. : ChangeLog
server/swf : ASHandlers.cpp
Log message:
* server/swf/ASHandlers.cpp (ActionGetUrl2): log a warning
when an undefined url parameter is on the stack.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.805&r2=1.806
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/ASHandlers.cpp?cvsroot=gnash&r1=1.59&r2=1.60
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.805
retrieving revision 1.806
diff -u -b -r1.805 -r1.806
--- ChangeLog 2 Sep 2006 12:19:00 -0000 1.805
+++ ChangeLog 2 Sep 2006 12:27:14 -0000 1.806
@@ -1,5 +1,7 @@
2006-09-02 Sandro Santilli <address@hidden>
+ * server/swf/ASHandlers.cpp (ActionGetUrl2): log a warning
+ when an undefined url parameter is on the stack.
* server/as_value.h: added is_undefined() method.
2006-09-01 Sandro Santilli <address@hidden>
Index: server/swf/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ASHandlers.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- server/swf/ASHandlers.cpp 1 Sep 2006 21:40:39 -0000 1.59
+++ server/swf/ASHandlers.cpp 2 Sep 2006 12:27:15 -0000 1.60
@@ -1563,7 +1563,7 @@
if ( *url_c == '\0' )
{
- log_warning("Bogus GetUrl2 url (empty) in SWF file, skipping");
+ log_warning("Bogus GetUrl url (empty) in SWF file, skipping");
return;
}
@@ -1646,8 +1646,17 @@
const char* target = env.top(0).to_string();
- const char* url = env.top(1).to_string();
+
+ as_value url_val = env.top(1);
+ if ( url_val.is_undefined() )
+ {
+ log_warning("Undefined GetUrl2 url on stack, skipping");
+ }
+ else
+ {
+ const char* url = url_val.to_string();
CommonGetUrl(env, target, url, method);
+ }
env.drop(2);
}