Re: [Gnash-commit] gnash ChangeLog server/parser/movie_def_impl.cpp

[Markus Gothe]

Are you sure we want to have a prefixed decrease on 'i'?

This implicates that "const import_info&        inf = m_imports[i-1];" will
never apply to the last element in m_imports.

In my eyes:
" for (size_t i = m_imports.size(); i > 0; i--)
        {
         const import_info&     inf = m_imports[i-1];"

look more correct or:

" for (size_t i = m_imports.size(); i >= 0; i--)
        {
         const import_info&     inf = m_imports[i];"


Well, this is up to you to fix since I'vent figured out what's stored
there yet. Alse we might want to set "bool imported" to false somewhere,
beacuse now it always true, no matter what. :-/

//Markus

Sandro Santilli wrote:
> CVSROOT:      /sources/gnash
> Module name:  gnash
> Changes by:   Sandro Santilli <strk>  06/08/28 10:55:40
> 
> Modified files:
>       .              : ChangeLog 
>       server/parser  : movie_def_impl.cpp 
> 
> Log message:
>               * server/parser/movie_def_impl.cpp (resolve_import):
>                 fixed infinite loop.
> 
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.745&r2=1.746
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.14&r2=1.15
> 
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.745
> retrieving revision 1.746
> diff -u -b -r1.745 -r1.746
> --- ChangeLog 28 Aug 2006 09:49:48 -0000      1.745
> +++ ChangeLog 28 Aug 2006 10:55:39 -0000      1.746
> @@ -1,3 +1,8 @@
> +2006-08-28 Sandro Santilli  <address@hidden>
> +
> +     * server/parser/movie_def_impl.cpp (resolve_import):
> +       fixed infinite loop.
> +
>  2006-08-28 Markus Gothe <address@hidden>
>       
>       * Merged in klash-patch sent by Patrice Dumas <address@hidden>.
> 
> Index: server/parser/movie_def_impl.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
> retrieving revision 1.14
> retrieving revision 1.15
> diff -u -b -r1.14 -r1.15
> --- server/parser/movie_def_impl.cpp  27 Aug 2006 20:56:34 -0000      1.14
> +++ server/parser/movie_def_impl.cpp  28 Aug 2006 10:55:40 -0000      1.15
> @@ -444,9 +444,9 @@
>      movie_definition*        def = static_cast<movie_definition*>(def_impl);
>  
>      // Iterate in reverse, since we remove stuff along the way.
> -    for (size_t i = m_imports.size() - 1; i >= 0; i--)
> +    for (size_t i = m_imports.size(); i > 0; --i)
>          {
> -            const import_info&       inf = m_imports[i];
> +            const import_info&       inf = m_imports[i-1];
>              if (inf.m_source_url == source_url)
>                  {
>                      // Do the import.
> 
> 
> _______________________________________________
> Gnash-commit mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/gnash-commit

signature.asc
Description: OpenPGP digital signature