Changeset 2853

Timestamp:

Feb 21, 2000, 9:26:45 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

Location:

trunk

Files:

• bin/ODIN.INI (modified) (1 diff)
• src/gdi32/dibsect.cpp (modified) (2 diffs)

trunk/bin/ODIN.INI

@@ -1 @@
-[DIRECTORIES]
-SYSTEM=C:\OS2\SYSTEM
-WINDOWS=C:\OS2
-
 [DLLRENAMEWIN]
 OLE32=OLE32OS2

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.19 2000-02-21 10:34:46 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.20 2000-02-21 20:26:45 sandervl Exp $ */
 
 /*
@@ -246 +246 @@
    {
         char *oldbits = bmpBits;
+        int oldsize = dibinfo.dsBm.bmWidthBytes * dibinfo.dsBm.bmHeight;
 
         DosAllocMem((PPVOID)&bmpBits, bmpsize*pbmi->biHeight, PAG_READ|PAG_WRITE|PAG_COMMIT);
-        memcpy(bmpBits, oldbits, bmpsize*pbmi->biHeight);
+        memcpy(bmpBits, oldbits, min(oldsize, bmpsize*pbmi->biHeight));
         DosFreeMem(oldbits);
    }