[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libbase/URL.cpp testsuite/libba...
From: |
Bastiaan Jacques |
Subject: |
[Gnash-commit] gnash ChangeLog libbase/URL.cpp testsuite/libba... |
Date: |
Tue, 17 Apr 2007 17:46:21 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Bastiaan Jacques <bjacques> 07/04/17 17:46:21
Modified files:
. : ChangeLog
libbase : URL.cpp
testsuite/libbase: URLTest.cpp
Log message:
* libbase/URL.cpp: Don't attempt to remove an item from the
vector
of strings if the vector is empty.
* testsuite/libbase/URLTest.cpp: Add a test which shouldn't
crash
anymore.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2898&r2=1.2899
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/URL.cpp?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/URLTest.cpp?cvsroot=gnash&r1=1.12&r2=1.13
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2898
retrieving revision 1.2899
diff -u -b -r1.2898 -r1.2899
--- ChangeLog 17 Apr 2007 14:57:20 -0000 1.2898
+++ ChangeLog 17 Apr 2007 17:46:19 -0000 1.2899
@@ -1,3 +1,10 @@
+2004-04-17 Bastiaan Jacques <address@hidden>
+
+ * libbase/URL.cpp: Don't attempt to remove an item from the vector
+ of strings if the vector is empty.
+ * testsuite/libbase/URLTest.cpp: Add a test which shouldn't crash
+ anymore.
+
2007-04-17 Udo Giacomozzi <address@hidden>
* backend/render_handler_agg_style.h: Added DEBUG_LIMIT_COLOR_ALPHA
Index: libbase/URL.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/URL.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- libbase/URL.cpp 25 Feb 2007 20:48:41 -0000 1.34
+++ libbase/URL.cpp 17 Apr 2007 17:46:20 -0000 1.35
@@ -170,7 +170,8 @@
prev = curr;
if ( comp == "" || comp == "." ) continue;
- if ( comp == ".." ) components.pop_back();
+ if ( comp == ".." && components.size() )
+ components.pop_back();
else components.push_back(comp);
}
}
Index: testsuite/libbase/URLTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/URLTest.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- testsuite/libbase/URLTest.cpp 5 Nov 2006 00:45:27 -0000 1.12
+++ testsuite/libbase/URLTest.cpp 17 Apr 2007 17:46:20 -0000 1.13
@@ -150,6 +150,10 @@
check_equals (u17.str() , "file:///test?.swf" );
check_equals (u17.querystring() , "" );
+ // Test that this doesn't crash.
+ URL u18("file:///loadMovieTest.swf");
+ URL u19("file://../../test.swf", u18);
+
// Test query_string parsing
map<string, string> qs;
- [Gnash-commit] gnash ChangeLog libbase/URL.cpp testsuite/libba...,
Bastiaan Jacques <=