@@ -898,7 +898,7 @@ gc_reset (struct gc_arena *a)

 }

 static inline void

-check_malloc_return (void *p)

+check_malloc_return (const void *p)

 {

   if (!p)

     out_of_memory ();

@@ -46,6 +46,8 @@

 #include <ctype.h>

 #include <assert.h>

+#include "buffer.h"

+

 /* MinGW w32api 3.17 is still incomplete when it comes to CryptoAPI while

  * MinGW32-w64 defines all macros used. This is a hack around that problem.

  */

@@ -116,7 +118,7 @@ static char *ms_error_text(DWORD ms_err)

 	(LPTSTR) &lpMsgBuf, 0, NULL);

     if (lpMsgBuf) {

 	char *p;

-	rv = strdup(lpMsgBuf);

+	rv = string_alloc(lpMsgBuf, NULL);

 	LocalFree(lpMsgBuf);

 	/* trim to the left */

 	if (rv)

@@ -822,7 +822,7 @@ void

 init_options_dev (struct options *options)

 {

   if (!options->dev && options->dev_node) {

-    char *dev_node = strdup(options->dev_node); /* POSIX basename() implementaions may modify its arguments */

+    char *dev_node = string_alloc(options->dev_node, NULL); /* POSIX basename() implementaions may modify its arguments */

     options->dev = basename (dev_node);

   }

 }

@@ -1615,7 +1615,7 @@ argv_extract_cmd_name (const char *path)

 {

   if (path)

     {

-      char *path_cp = strdup(path); /* POSIX basename() implementaions may modify its arguments */

+      char *path_cp = string_alloc(path, NULL); /* POSIX basename() implementaions may modify its arguments */

       const char *bn = basename (path_cp);

       if (bn)

 	{

@@ -2578,7 +2578,7 @@ check_file_access(const int type, const char *file, const int mode, const char *

   /* Is the directory path leading to the given file accessible? */

   if (type & CHKACC_DIRPATH)

     {

-      char *fullpath = strdup(file);  /* POSIX dirname() implementaion may modify its arguments */

+      char *fullpath = string_alloc (file, NULL);  /* POSIX dirname() implementaion may modify its arguments */

       char *dirpath = dirname(fullpath);

       if (platform_access (dirpath, mode|X_OK) != 0)

@@ -197,7 +197,7 @@ tls_ctx_restrict_ciphers(struct tls_root_ctx *ctx, const char *ciphers)

   /* Parse allowed ciphers, getting IDs */

   i = 0;

-  tmp_ciphers_orig = tmp_ciphers = strdup(ciphers);

+  tmp_ciphers_orig = tmp_ciphers = string_alloc (ciphers, NULL);

   token = strtok (tmp_ciphers, ":");

   while(token)