Applied patch [ 745983 ] Fix for memory leak in class wxPluginManager in dynload.cpp

[wxWidgets.git] / src / mac / morefile / DirectoryCopy.c

diff --git a/src/mac/morefile/DirectoryCopy.c b/src/mac/morefile/DirectoryCopy.c
index ed9c8347188dc773aa06e6ec8e9894272659aff1..dd484c9b2ce3faa61e5872ba0b21717562c4b9c1 100644 (file)
--- a/src/mac/morefile/DirectoryCopy.c
+++ b/src/mac/morefile/DirectoryCopy.c
@@ -260,7 +260,7 @@ static      void    CopyLevel(long sourceDirID,
                                                  long dstDirID,
                                                  EnumerateGlobals *theGlobals)
 {
                                                  long dstDirID,
                                                  EnumerateGlobals *theGlobals)
 {

-       long currentSrcDirID;
+       long currentSrcDirID = 0 ;

        long newDirID;
        short index = 1;
        
        long newDirID;
        short index = 1;
        


@@ -325,6 +325,7 @@ static      void    CopyLevel(long sourceDirID,
                                        }
                                        else    /* error handling for DirCreate */
                                        {
                                        }
                                        else    /* error handling for DirCreate */
                                        {

+                                               /* note that currentSrcDirID has not been initialised when entering this execution path */

                                                if ( theGlobals->errorHandler != NULL )
                                                {
                                                        theGlobals->bailout = CallCopyErrProc(theGlobals->errorHandler, theGlobals->error, dirCreateOp,
                                                if ( theGlobals->errorHandler != NULL )
                                                {
                                                        theGlobals->bailout = CallCopyErrProc(theGlobals->errorHandler, theGlobals->error, dirCreateOp,