[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

Alexandre Julliard julliard at winehq.org
Sun Jun 17 20:03:04 UTC 2012


The following commit has been merged in the wheezy branch:
commit d307d15ea7bfe6281ad13755fb18edab3094762c
Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Mar 30 18:19:48 2012 +0200

    jscript: Fixed jsheap_grow implementation.
    (cherry picked from commit b3bafb60a278bfe23d67923d399d46f2da11dd46)

diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c
index b145d8a..a7373cc 100644
--- a/dlls/jscript/jsutils.c
+++ b/dlls/jscript/jsutils.c
@@ -125,13 +125,18 @@ void *jsheap_alloc(jsheap_t *heap, DWORD size)
 
 void *jsheap_grow(jsheap_t *heap, void *mem, DWORD size, DWORD inc)
 {
+    void *ret;
+
     if(mem == (BYTE*)heap->blocks[heap->last_block] + heap->offset-size
        && heap->offset+inc < block_size(heap->last_block)) {
         heap->offset += inc;
         return mem;
     }
 
-    return jsheap_alloc(heap, size+inc);
+    ret = jsheap_alloc(heap, size+inc);
+    if(ret) /* FIXME: avoid coppying for custom blocks */
+        memcpy(ret, mem, size);
+    return ret;
 }
 
 void jsheap_clear(jsheap_t *heap)

-- 
Debian Wine packaging



More information about the pkg-wine-party mailing list