diff options
Diffstat (limited to 'winsup/cygwin/sec_helper.cc')
-rw-r--r-- | winsup/cygwin/sec_helper.cc | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/winsup/cygwin/sec_helper.cc b/winsup/cygwin/sec_helper.cc index 41a9b16d6..7f71c8474 100644 --- a/winsup/cygwin/sec_helper.cc +++ b/winsup/cygwin/sec_helper.cc @@ -266,10 +266,7 @@ security_descriptor::malloc (size_t nsize) { free (); if ((psd = (PSECURITY_DESCRIPTOR) ::malloc (nsize))) - { - sd_size = nsize; - type = malloced; - } + sd_size = nsize; return psd; } @@ -278,23 +275,9 @@ security_descriptor::realloc (size_t nsize) { PSECURITY_DESCRIPTOR tmp; - if (type == malloced) - { - if (!(tmp = (PSECURITY_DESCRIPTOR) ::realloc (psd, nsize))) - return NULL; - } - else - { - if (!(tmp = (PSECURITY_DESCRIPTOR) ::malloc (nsize))) - return NULL; - if (psd) - { - memcpy (tmp, psd, LocalSize (psd)); - LocalFree (psd); - } - } + if (!(tmp = (PSECURITY_DESCRIPTOR) ::realloc (psd, nsize))) + return NULL; sd_size = nsize; - type = malloced; return psd = tmp; } @@ -302,15 +285,9 @@ void security_descriptor::free () { if (psd) - { - if (type == local_alloced) - LocalFree (psd); - else - ::free (psd); - } + ::free (psd); psd = NULL; sd_size = 0; - type = local_alloced; } #if 0 // unused |