Re: Patch for #2652, take two

From: Dom Lachowicz (doml@appligent.com)
Date: Wed Mar 06 2002 - 20:48:35 GMT

  • Next message: birger.langkjer@worldonline.dk: "Danish strings again"

    Committed.

    Dom

    On Wed, 2002-03-06 at 15:38, Robert Wilhelm wrote:
    > Hi Dom,
    >
    > as discussed on IRC, here is another way to fix the double free.
    >
    > Robert
    >
    > ----
    >

    > Index: ie_imp_MsWord_97.cpp
    > ===================================================================
    > RCS file: /cvsroot/abi/src/wp/impexp/xp/ie_imp_MsWord_97.cpp,v
    > retrieving revision 1.151
    > diff -u -r1.151 ie_imp_MsWord_97.cpp
    > --- ie_imp_MsWord_97.cpp 26 Feb 2002 10:20:12 -0000 1.151
    > +++ ie_imp_MsWord_97.cpp 6 Mar 2002 15:46:22 -0000
    > @@ -2474,7 +2474,8 @@
    > if ((error != UT_OK) || !pFG)
    > {
    > UT_DEBUGMSG(("Could not import graphic\n"));
    > - DELETEP(pictData);
    > + // pictData is already freed in ~FG_Graphic
    > + // DELETEP(pictData);
    > FREEP(mimetype);
    > goto Cleanup;
    > }





    This archive was generated by hypermail 2.1.4 : Wed Mar 06 2002 - 15:57:28 GMT