Ticket #4842: libs_libmythdvdnav_searching.c-init-new_vobu.patch

File libs_libmythdvdnav_searching.c-init-new_vobu.patch, 1.1 KB (added by Erik Hovland <erik@…>, 16 years ago)

Initialize new_vobu at the beginning of dvdnav_time_search_within_cell. After that is done a conditional farther down can be reworked to be a little simpler (removes some code)

  • libs/libmythdvdnav/searching.c 

    new_vobu might be used uninitialized.

From: Erik Hovland <erik@hovland.org>


---

 libs/libmythdvdnav/searching.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libs/libmythdvdnav/searching.c b/libs/libmythdvdnav/searching.c
index 1524e9b..4667d3f 100644
    a b dvdnav_status_t dvdnav_time_search_within_cell(dvdnav_t *this, 
    660660    return DVDNAV_STATUS_ERR;
    661661  }
    662662
    663   uint32_t cur_vobu, new_vobu, start, offset;
     663  uint32_t cur_vobu, new_vobu = 0, start, offset;
    664664  uint32_t first_cell_nr, last_cell_nr, cell_nr;
    665665  cell_playback_t *cell;
    666666  int i, length, scan_admap;
    … … dvdnav_status_t dvdnav_time_search_within_cell(dvdnav_t *this, 
    715715          if (offset >> 31) {
    716716            new_vobu = cur_vobu - (offset & 0xffff);
    717717          } else {
    718             if (cell_nr == first_cell_nr) {
    719               new_vobu = 0;
    720             } else {
     718            if (cell_nr != first_cell_nr) {
    721719              cell_nr--;
    722720              offset = state->pgc->cell_playback[cell_nr].last_sector;
    723721              scan_admap = 1;