Attachment 712561 Details for Bug 923166 – proposed fix

[patch] proposed fix

0001-19.0.2-4-fix-mozbz-852002.patch (text/plain), 5.28 KB, created by Alon Levy on 2013-03-19 10:50:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alon Levy

Created: 2013-03-19 10:50:44 UTC

Size: 5.28 KB

patch

obsolete

>From 38ee3e28f8d807d56cfd6c98b1ac2c8141531070 Mon Sep 17 00:00:00 2001
>From: Alon Levy <alon@pobox.com>
>Date: Tue, 19 Mar 2013 12:49:09 +0200
>Subject: [PATCH] 19.0.2-4 fix mozbz#852002
>
>Signed-off-by: Alon Levy <alon@pobox.com>
>---
> bug852002_v0.fedora.patch | 115 ++++++++++++++++++++++++++++++++++++++++++++++
> xulrunner.spec            |   8 +++-
> 2 files changed, 122 insertions(+), 1 deletion(-)
> create mode 100644 bug852002_v0.fedora.patch
>
>diff --git a/bug852002_v0.fedora.patch b/bug852002_v0.fedora.patch
>new file mode 100644
>index 0000000..20828e7
>--- /dev/null
>+++ b/bug852002_v0.fedora.patch
>@@ -0,0 +1,115 @@
>+commit 1801e77d4bab5bd30fc605c3558f2c3dc4f81f4d
>+Author: Alon Levy <alon@pobox.com>
>+Date:   Tue Mar 19 09:44:19 2013 +0200
>+
>+    bug fix
>+
>+diff --git a/mozilla-release/media/libnestegg/src/nestegg.c b/mozilla-release/media/libnestegg/src/nestegg.c
>+index e954415..5b55a32 100644
>+--- a/mozilla-release/media/libnestegg/src/nestegg.c
>++++ b/mozilla-release/media/libnestegg/src/nestegg.c
>+@@ -275,6 +275,7 @@ struct saved_state {
>+   struct list_node * ancestor;
>+   uint64_t last_id;
>+   uint64_t last_size;
>++  int last_valid;
>+ };
>+ 
>+ struct frame {
>+@@ -290,6 +291,7 @@ struct nestegg {
>+   struct pool_ctx * alloc_pool;
>+   uint64_t last_id;
>+   uint64_t last_size;
>++  int last_valid;
>+   struct list_node * ancestor;
>+   struct ebml ebml;
>+   struct segment segment;
>+@@ -810,6 +812,7 @@ ne_ctx_save(nestegg * ctx, struct saved_state * s)
>+   s->ancestor = ctx->ancestor;
>+   s->last_id = ctx->last_id;
>+   s->last_size = ctx->last_size;
>++  s->last_valid = ctx->last_valid;
>+   return 0;
>+ }
>+ 
>+@@ -824,6 +827,7 @@ ne_ctx_restore(nestegg * ctx, struct saved_state * s)
>+   ctx->ancestor = s->ancestor;
>+   ctx->last_id = s->last_id;
>+   ctx->last_size = s->last_size;
>++  ctx->last_valid = s->last_valid;
>+   return 0;
>+ }
>+ 
>+@@ -832,7 +836,7 @@ ne_peek_element(nestegg * ctx, uint64_t * id, uint64_t * size)
>+ {
>+   int r;
>+ 
>+-  if (ctx->last_id && ctx->last_size) {
>++  if (ctx->last_valid) {
>+     if (id)
>+       *id = ctx->last_id;
>+     if (size)
>+@@ -853,6 +857,8 @@ ne_peek_element(nestegg * ctx, uint64_t * id, uint64_t * size)
>+   if (size)
>+     *size = ctx->last_size;
>+ 
>++  ctx->last_valid = 1;
>++
>+   return 1;
>+ }
>+ 
>+@@ -865,8 +871,7 @@ ne_read_element(nestegg * ctx, uint64_t * id, uint64_t * size)
>+   if (r != 1)
>+     return r;
>+ 
>+-  ctx->last_id = 0;
>+-  ctx->last_size = 0;
>++  ctx->last_valid = 0;
>+ 
>+   return 1;
>+ }
>+@@ -965,7 +970,7 @@ ne_parse(nestegg * ctx, struct ebml_element_desc * top_level, int64_t max_offset
>+ {
>+   int r;
>+   int64_t * data_offset;
>+-  uint64_t id, size;
>++  uint64_t id, size, peeked_id;
>+   struct ebml_element_desc * element;
>+ 
>+   if (!ctx->ancestor)
>+@@ -980,6 +985,7 @@ ne_parse(nestegg * ctx, struct ebml_element_desc * top_level, int64_t max_offset
>+     r = ne_peek_element(ctx, &id, &size);
>+     if (r != 1)
>+       break;
>++    peeked_id = id;
>+ 
>+     element = ne_find_element(id, ctx->ancestor->node);
>+     if (element) {
>+@@ -993,6 +999,7 @@ ne_parse(nestegg * ctx, struct ebml_element_desc * top_level, int64_t max_offset
>+       r = ne_read_element(ctx, &id, &size);
>+       if (r != 1)
>+         break;
>++      assert(id == peeked_id);
>+ 
>+       if (element->flags & DESC_FLAG_OFFSET) {
>+         data_offset = (int64_t *) (ctx->ancestor->data + element->data_offset);
>+@@ -1431,8 +1438,7 @@ ne_init_cue_points(nestegg * ctx, int64_t max_offset)
>+     r = ne_io_seek(ctx->io, ctx->segment_offset + seek_pos, NESTEGG_SEEK_SET);
>+     if (r != 0)
>+       return -1;
>+-    ctx->last_id = 0;
>+-    ctx->last_size = 0;
>++    ctx->last_valid = 0;
>+ 
>+     r = ne_read_element(ctx, &id, NULL);
>+     if (r != 1)
>+@@ -1694,8 +1700,7 @@ nestegg_track_seek(nestegg * ctx, unsigned int track, uint64_t tstamp)
>+   r = ne_io_seek(ctx->io, ctx->segment_offset + seek_pos, NESTEGG_SEEK_SET);
>+   if (r != 0)
>+     return -1;
>+-  ctx->last_id = 0;
>+-  ctx->last_size = 0;
>++  ctx->last_valid = 0;
>+ 
>+   while (ctx->ancestor)
>+     ne_ctx_pop(ctx);
>diff --git a/xulrunner.spec b/xulrunner.spec
>index ef39295..51cf02d 100644
>--- a/xulrunner.spec
>+++ b/xulrunner.spec
>@@ -76,7 +76,7 @@
> Summary:        XUL Runtime for Gecko Applications
> Name:           xulrunner
> Version:        19.0.2
>-Release:        3%{?pre_tag}%{?dist}
>+Release:        4%{?pre_tag}%{?dist}
> URL:            http://developer.mozilla.org/En/XULRunner
> License:        MPLv1.1 or GPLv2+ or LGPLv2+
> Group:          Applications/Internet
>@@ -104,6 +104,8 @@ Patch101:       mozilla-791626.patch
> Patch102:       mozilla-239254.patch
> Patch103:       mozilla-826171.patch
> 
>+Patch200:       bug852002_v0.fedora.patch
>+
> # ---------------------------------------------------
> 
> %if %{?system_nss}
>@@ -239,6 +241,7 @@ cd %{tarballdir}
> %patch101 -p1 -b .791626
> %patch102 -p1 -b .239254
> %patch103 -p1 -b .826171
>+%patch200 -p2 -b .852002
> 
> %{__rm} -f .mozconfig
> %{__cp} %{SOURCE10} .mozconfig
>@@ -518,6 +521,9 @@ fi
> #---------------------------------------------------------------------
> 
> %changelog
>+* Tue Mar 19 2013 Alon Levy <alevy@redhat.com> - 19.0.2-4
>+- Add fix for mozbz#852002 - webm with zero sized element parse failure.
>+
> * Tue Mar 19 2013 Martin Stransky <stransky@redhat.com> - 19.0.2-3
> - Added fix for mozbz#826171/rhbz#922904 - strndup implementation 
>   in memory/build/mozmemory_wrap.c is broken
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 923166: 712561 | 712562