CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/12/13 15:56:06
Modified files:
. : ChangeLog
backend : render_handler_agg.cpp
libbase : string_table.h
server : Property.cpp Property.h PropertyList.cpp
PropertyList.h
server/parser : abc_block.cpp abc_block.h
Log message:
Fix -pedantic errors, make sure PropertyList always initialize
all members. Unfortunately, this doesn't fix the valgrind-reported
conditional jumps based on uninitialized memory.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5161&r2=1.5162
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/string_table.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Property.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Property.h?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/PropertyList.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/PropertyList.h?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/abc_block.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/abc_block.h?cvsroot=gnash&r1=1.8&r2=1.9
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5161
retrieving revision 1.5162
diff -u -b -r1.5161 -r1.5162
--- ChangeLog 13 Dec 2007 11:40:12 -0000 1.5161
+++ ChangeLog 13 Dec 2007 15:56:05 -0000 1.5162
@@ -1,5 +1,14 @@
2007-12-13 Sandro Santilli <[EMAIL PROTECTED]>
+ * backend/render_handler_agg.cpp, libbase/string_table.h,
+ server/Property.{cpp,h}, server/PropertyList.{cpp,h},
+ server/parser/abc_block.{cpp,h}:
+ Fix -pedantic errors, make sure PropertyList always initialize
+ all members. Unfortunately, this doesn't fix the valgrind-reported
+ conditional jumps based on uninitialized memory.
+
+2007-12-13 Sandro Santilli <[EMAIL PROTECTED]>
+
* server/swf/tag_loaders.cpp (jpeg_tables_loader): don't limit
StreamAdapter input as the *same* jpeg loader will be used
to parse subsequent tags. This reintroduces possible seek-backs
Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- backend/render_handler_agg.cpp 12 Dec 2007 10:06:58 -0000 1.123
+++ backend/render_handler_agg.cpp 13 Dec 2007 15:56:06 -0000 1.124
@@ -17,7 +17,7 @@
-/* $Id: render_handler_agg.cpp,v 1.123 2007/12/12 10:06:58 zoulunkai Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.124 2007/12/13 15:56:06 strk Exp $ */
// Original version by Udo Giacomozzi and Hannes Mayr,
// INDUNET GmbH (www.indunet.it)
@@ -2095,11 +2095,11 @@
struct {
boost::uint8_t b1;
boost::uint8_t b2;
- };
+ } s;
} u;
- u.b1 = 1;
- u.b2 = 2;
+ u.s.b1 = 1;
+ u.s.b2 = 2;
return u.word == 0x0201;
Index: libbase/string_table.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/string_table.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libbase/string_table.h 18 Oct 2007 11:47:53 -0000 1.5
+++ libbase/string_table.h 13 Dec 2007 15:56:06 -0000 1.6
@@ -145,5 +145,5 @@
bool mSetToLower; // If true, affects the next group addition.
};
-}; /* namespace gnash */
+} /* namespace gnash */
#endif /* GNASH_STRING_TABLE_H */
Index: server/Property.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/Property.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/Property.cpp 21 Nov 2007 09:21:49 -0000 1.4
+++ server/Property.cpp 13 Dec 2007 15:56:06 -0000 1.5
@@ -113,6 +113,6 @@
abort(); // Not here.
break;
}
-};
+}
} // namespace gnash
Index: server/Property.h
===================================================================
RCS file: /sources/gnash/gnash/server/Property.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/Property.h 21 Nov 2007 09:21:49 -0000 1.15
+++ server/Property.h 13 Dec 2007 15:56:06 -0000 1.16
@@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: Property.h,v 1.15 2007/11/21 09:21:49 cmusick Exp $ */
+/* $Id: Property.h,v 1.16 2007/12/13 15:56:06 strk Exp $ */
#ifndef GNASH_PROPERTY_H
#define GNASH_PROPERTY_H
@@ -82,7 +82,7 @@
public:
/// Default constructor
Property(string_table::key name = 0, string_table::key nsId = 0) :
- mBound(as_value()), mName(name), mNamespace(nsId)
+ mBound(as_value()), mDestructive(false), mName(name),
mNamespace(nsId)
{/**/}
/// Copy constructor
Index: server/PropertyList.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/PropertyList.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/PropertyList.cpp 14 Nov 2007 07:36:55 -0000 1.25
+++ server/PropertyList.cpp 13 Dec 2007 15:56:06 -0000 1.26
@@ -38,6 +38,8 @@
namespace gnash {
PropertyList::PropertyList(const PropertyList& pl)
+ :
+ mDefaultOrder(pl.mDefaultOrder) // correct ?
{
import(pl);
}
@@ -48,6 +50,7 @@
if ( this != &pl )
{
clear();
+ mDefaultOrder = pl.mDefaultOrder;
import(pl);
}
return *this;
@@ -207,7 +210,11 @@
PropertyList::getProperty(string_table::key key, string_table::key nsId)
{
container::iterator found = iterator_find(_props, key, nsId);
- if (found == _props.end()) return NULL;
+ if (found == _props.end())
+ {
+ //log_error("getProperty(%s): not found",
VM::get().getStringTable().value(key).c_str());
+ return NULL;
+ }
return const_cast<Property*>(&(*found));
}
Index: server/PropertyList.h
===================================================================
RCS file: /sources/gnash/gnash/server/PropertyList.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/PropertyList.h 18 Oct 2007 11:47:53 -0000 1.20
+++ server/PropertyList.h 13 Dec 2007 15:56:06 -0000 1.21
@@ -84,7 +84,10 @@
> container;
/// Construct the PropertyList
- PropertyList() : _props()
+ PropertyList()
+ :
+ _props(),
+ mDefaultOrder(0) // correct ?
{/**/}
/// Copy constructor
Index: server/parser/abc_block.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/abc_block.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/parser/abc_block.cpp 12 Dec 2007 10:23:46 -0000 1.10
+++ server/parser/abc_block.cpp 13 Dec 2007 15:56:06 -0000 1.11
@@ -254,7 +254,7 @@
return true;
}
-}; // namespace abc_parsing
+} // namespace abc_parsing
using namespace abc_parsing;
@@ -1148,5 +1148,5 @@
mTheObject = mCH->getGlobalNs()->getClass(NSV::CLASS_OBJECT);
}
-}; /* namespace gnash */
+} /* namespace gnash */
Index: server/parser/abc_block.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/abc_block.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/parser/abc_block.h 12 Dec 2007 10:23:46 -0000 1.8
+++ server/parser/abc_block.h 13 Dec 2007 15:56:06 -0000 1.9
@@ -93,7 +93,7 @@
}
};
-}; // namespace abc_parsing
+} // namespace abc_parsing
typedef std::vector<asNamespace*> NamespaceSet;
@@ -180,7 +180,7 @@
abc_block();
};
-}; /* namespace gnash */
+} /* namespace gnash */
#endif /* GNASH_ABC_BLOCK_H */
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
