Changeset 681957e in git

Timestamp:

Aug 24, 2000, 4:07:10 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4f65c4b8cfe78257f54d326cd1a5e89c3c0117e7

Parents:

5c5c07bd36d915cf943f0c489ad4482807f941fb

Message:

* bug fix


git-svn-id: file:///usr/local/Singular/svn/trunk@4554 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• omalloc/omDebugTrack.c (modified) (2 diffs)

omalloc/omDebugTrack.c

@@ -4 +4 @@
  *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omDebugTrack.c,v 1.4 2000-08-18 09:05:52 obachman Exp $
+ *  Version: $Id: omDebugTrack.c,v 1.5 2000-08-24 14:07:10 obachman Exp $
  *******************************************************************/
 #include <limits.h>
@@ -506 +506 @@
   else
   {
-      if (flags & OM_FBIN)
-      {
-        size_t size = omTrackAddr_2_OutSize(d_addr);
-        omAddrCheckReturnError(!omIsKnownTopBin((omBin) bin_size, 1), omError_UnknownBin);
-        omAddrCheckReturnError(size < (((omBin)bin_size)->sizeW<<LOG_SIZEOF_LONG), omError_WrongBin);
-      }
-      else if (flags & OM_FSIZE && (!(flags & OM_FSLOPPY)  || bin_size > 0))
-      {
-        omAddrCheckReturnError(omTrackAddr_2_OutSize(d_addr) < (size_t) bin_size, omError_WrongSize);
-      }
+    /* track < 2 */
+    if (flags & OM_FBIN)
+    {
+      size_t size = omTrackAddr_2_OutSize(d_addr);
+      omAddrCheckReturnError(!omIsKnownTopBin((omBin) bin_size, 1), omError_UnknownBin);
+      omAddrCheckReturnError(size < (((omBin)bin_size)->sizeW<<LOG_SIZEOF_LONG), omError_WrongBin);
+    }
+    else if (flags & OM_FSIZE && (!(flags & OM_FSLOPPY)  || bin_size > 0))
+    {
+      omAddrCheckReturnError(omTrackAddr_2_OutSize(d_addr) < (size_t) bin_size, omError_WrongSize);
+    }
+    else if (flags & OM_FBINADDR)
+    {
+      size_t size = omTrackAddr_2_OutSize(d_addr);
+      omAddrCheckReturnError(size > OM_MAX_BLOCK_SIZE, omError_NotBinAddr);
+    }
   }
   return omError_NoError;