Commit (STABLE): Re: Commit(HEAD) Patch: 2633 part 2

Backport: Sanity check to fix abi1_test.doc from bug 2633. (Robert
Wilhelm)

CVS:
----------------------------------------------------------------------
CVS: Enter Log. Lines beginning with `CVS:' are removed automatically
CVS:
CVS: Committing in .
CVS:
CVS: Modified Files:
CVS: Tag: ABI-2-0-0-STABLE
CVS: ./libole2/ms-ole.c
CVS:
----------------------------------------------------------------------

On ma, 2004-09-13 at 22:59 +0200, Robert Wilhelm wrote:
> could be backported.
>
> On Mon, 2004-09-13 at 22:45, Dom Lachowicz wrote:
> > Patch approved.
> >
> > Thanks,
> > Dom
> >
> > --- Robert Wilhelm <robert.wilhelm@gmx.net> wrote:
> >
> > > The file abi1_test.doc from bug 2633 is broken.
> > > We used to crash because we wanted to access memory
> > > after the mmap file.
> > > I have added a sanity check to prevent this from
> > > happening.
> > >
> > > Now AbiWord asks for a password for this file. I am
> > > not sure
> > > whether this should be fixed...
> > >
> > > Robert
> > >
> > > P.S. libgsf does not crash. I will look into
> > > substituting libole2
> > > with libgsf after Abiword 2.2 is released.
> > >
> > >
> > >
> > >
> > > > Index: ms-ole.c
> > >
> > ===================================================================
> > > RCS file: /cvsroot/wv/libole2/ms-ole.c,v
> > > retrieving revision 1.44
> > > diff -u -r1.44 ms-ole.c
> > > --- ms-ole.c 4 Sep 2004 22:34:40 -0000 1.44
> > > +++ ms-ole.c 13 Sep 2004 20:28:45 -0000
> > > @@ -1086,6 +1086,11 @@
> > > #if OLE_DEBUG > 0
> > > g_print ("get_pps_ptr: blk = %d\n", blk);
> > > #endif
> > > +
> > > + if ( blk > BLOCK_COUNT(f)) {
> > > + g_warning ("Serious error finding pps %d\n", i);
> > > + return 0;
> > > + }
> > >
> > > if (forwrite)
> > > return BB_W_PTR(f, blk) +
> > > (i%(BB_BLOCK_SIZE/PPS_BLOCK_SIZE))*PPS_BLOCK_SIZE;
> > >
> >
> >
> >
> >
> > __________________________________
> > Do you Yahoo!?
> > Yahoo! Mail Address AutoComplete - You start. We finish.
> > http://promotions.yahoo.com/new_mail
> >
>
Received on Wed Sep 22 02:01:21 2004