Changeset 631

Timestamp:

Jan 5, 2021, 5:15:50 AM (5 years ago)

Author:

Paul Smedley

Message:

Fixes for ksize() from Steven Levine

File:

• GPL/branches/uniaud32-next/lib32/memory.c (modified) (5 diffs)

GPL/branches/uniaud32-next/lib32/memory.c

@@ -73 +73 @@
 
 typedef struct _BaseAddr {
-    ULONG                  base;
-    ULONG                  retaddr;
-    ULONG                  size;
+    ULONG                  base;        // VMAlloc addr
+    ULONG                  retaddr;     // aligned addr returned to caller
+    ULONG                  size;        // VMAlloc size
     struct _BaseAddr NEAR *next;
 } BaseAddr;
@@ -115 +115 @@
     pCur = pBaseAddrHead;
 
+    // If address is in list, remove list item and free entry
+    // Caller must VMFree returned address or else
     if(pCur->retaddr == addr)
     {
@@ -287 +289 @@
 
         if(startpage != endpage) {
-            //try once more
+            // not in same 32K page, try once more
             rc = VMAlloc(size, flags, (LINEAR *)&tempaddr);
             VMFree((LINEAR)addr);
@@ -377 +379 @@
 
             if (startpage != endpage) {
+                // Not in same 32K page
                 physaddr2 = (startpage+1) << 16;
 
@@ -690 +693 @@
 
         if (!block)
-                return 0;
-
-        if (block == ZERO_SIZE_PTR)
-                return 0;
-
-        GetBaseAddressNoFree((ULONG)block, (ULONG NEAR *)__Stack32ToFlat(&size));
+            size = 0;                   // Bad coder
+
+        else if (block == ZERO_SIZE_PTR)
+            size = 0;                   // Bad coder
+
+        else if(IsHeapAddr((ULONG)block))
+            size = _msize((void _near *)block);
+
+        else if (!GetBaseAddressNoFree((ULONG)block, (ULONG NEAR *)__Stack32ToFlat(&size)))
+            size = 0;                   // Something wrong
 
         return size;