[Wvware-devel] Re: wv: Changes in ms-ole.c

[Dom L. <ci...@ho...>]

Committed patch from Stefan v. Wachter. Time to resync() with the libole2 
tree.

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


>From: "Stefan v. Wachter" <sv...@mu...>
>To: Dom Lachowicz <ci...@ho...>
>Subject: wv: Changes in ms-ole.c
>Date: Thu, 28 Dec 2000 14:36:18 +0100
>
>Hello Dom,
>
>I made some changes to ms-ole.c, which are important if want to call
>wvHtml() or wvInitParser() ore than once (we had memory errors, because
>after calling wvInitParser() with a non Word file, some memory was freed
>twice):
>
>diff -r1.1 ms-ole.c
>171c171
><     return write (fd, buf, count);
>---
> >     return write (fd, (void*)buf, count);
>1566a1567
> >         *f = 0;
>1572a1574
> >         *f = 0;
>1580a1583
> >         *f = 0;
>1599a1603
> >                 *f = 0;
>1614a1619
> >             *f = 0;
>1673c1678
><                       O_RDWR|O_CREAT|O_TRUNC|O_NONBLOCK,
>---
> >                       O_RDWR|O_CREAT|O_TRUNC /*|O_NONBLOCK*/,
>1774a1780,1781
> >     if (! l)
> >         return;
>1777c1784
><         if (pps->name)
>---
> >         if (pps->name) {
>1778a1786,1787
> >             pps->name = 0;
> >         }
>1779a1789
> >         pps->children = 0;
>1780a1791
> >         pps = 0; /* stw */
>1817,1823c1828,1836
><             for (i = 0; (f->bbattr) && (i < f->bbattr->len); i++) {
><                 BBBlkAttr *attr = g_ptr_array_index (f->bbattr, i);
><                 if (f->dirty && attr->dirty)
><                     write_cache_block (f, attr);
><                 g_free (attr->data);
><                 attr->data = 0;
><             }
>---
> >             if (f->bbattr)
> >                 for (i = 0; i < f->bbattr->len; i++) {
> >                     BBBlkAttr *attr = g_ptr_array_index (f->bbattr, i);
> >                     if (f->dirty && attr->dirty)
> >                         write_cache_block (f, attr);
> >                     g_free (attr->data);
> >                     attr->data = 0;
> >                 }
> >             f->bbattr = 0;   /* stw 2000-12-15 */
>1833a1847
> >         f->pps = 0; /* stw */

_________________________________________________________________
Get your FREE download of MSN Explorer at http://explorer.msn.com