Changeset 89124ff

Timestamp:

Oct 25, 2019, 5:34:08 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

9bdb8b7

Parents:

eb5a115

Message:

add extra alignment check and missing frees

File:

• libcfa/src/stdlib.cfa (modified) (5 diffs)

libcfa/src/stdlib.cfa

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Oct 20 18:41:23 2019
-// Update Count     : 473
+// Last Modified On : Tue Oct 22 08:57:52 2019
+// Update Count     : 478
 //
 
@@ -21 +21 @@
 #include <string.h>                                                                             // memcpy, memset
 #include <malloc.h>                                                                             // malloc_usable_size
-#include <math.h>                                                                               // fabsf, fabs, fabsl
+//#include <math.h>                                                                             // fabsf, fabs, fabsl
 #include <complex.h>                                                                    // _Complex_I
 #include <assert.h>
@@ -41 +41 @@
                 char * nptr;
                 size_t alignment = malloc_alignment( ptr );
-                if ( align != alignment ) {
+                if ( align != alignment && (uintptr_t)ptr % align != 0 ) {
                         size_t olen = malloc_usable_size( ptr );        // current allocation
                         nptr = (char *)memalign( align, olen );
@@ -47 +47 @@
                         size_t lnth = olen < nlen ? olen : nlen;        // min
                         memcpy( nptr, ptr, lnth );                                      // initialize storage
+                        free( ptr );
                 } else {
                         nptr = (char *)ptr;
@@ -62 +63 @@
                         size_t lnth = olen < nlen ? olen : nlen;        // min
                         memcpy( nptr, ptr, lnth );                                      // initialize storage
+                        free( ptr );
                 } else {
                         nptr = (char *)realloc( (void *)ptr, dim * sizeof(T) ); // C realloc