X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fmalware.c;h=ef27daf377b2d336ef354979dae2e62f23138dfa;hb=ed1620555d261c5e970dbbe873bf4b19026b0e48;hp=91649cf2022d0d51089e652fceb4a993be35431b;hpb=0a5441fcd93ae4145c07b3ed138dfe0e107174e0;p=exim.git

diff --git a/src/src/malware.c b/src/src/malware.c
index 91649cf20..ef27daf37 100644
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -302,8 +302,7 @@ const uschar * rerror;
 int roffset;
 const pcre * cre;
 
-cre = pcre_compile(CS re, PCRE_COPT, (const char **)&rerror, &roffset, NULL);
-if (!cre)
+if (!(cre = pcre_compile(CS re, PCRE_COPT, CCSS &rerror, &roffset, NULL)))
   *errstr= string_sprintf("regular expression error in '%s': %s at offset %d",
       re, rerror, roffset);
 return cre;
@@ -317,7 +316,7 @@ int i = pcre_exec(cre, NULL, CS text, Ustrlen(text), 0, 0,
 	      ovector, nelem(ovector));
 uschar * substr = NULL;
 if (i >= 2)				/* Got it */
-  pcre_get_substring(CS text, ovector, i, 1, (const char **) &substr);
+  pcre_get_substring(CS text, ovector, i, 1, CCSS &substr);
 return substr;
 }
 
@@ -836,7 +835,7 @@ badseek:  err = errno;
 	    malware_daemon_ctx.sock);
 	  }
 
-	if (!(drweb_fbuf = US malloc(fsize_uint)))
+	if (!(drweb_fbuf = store_malloc(fsize_uint)))
 	  {
 	  (void)close(drweb_fd);
 	  return m_panic_defer_3(scanent, NULL,
@@ -849,7 +848,7 @@ badseek:  err = errno;
 	  {
 	  int err = errno;
 	  (void)close(drweb_fd);
-	  free(drweb_fbuf);
+	  store_free(drweb_fbuf);
 	  return m_panic_defer_3(scanent, NULL,
 	    string_sprintf("can't read spool file %s: %s",
 	      eml_filename, strerror(err)),
@@ -860,11 +859,12 @@ badseek:  err = errno;
 	/* send file body to socket */
 	if (send(malware_daemon_ctx.sock, drweb_fbuf, fsize, 0) < 0)
 	  {
-	  free(drweb_fbuf);
+	  store_free(drweb_fbuf);
 	  return m_panic_defer_3(scanent, CUS callout_address, string_sprintf(
 	    "unable to send file body to socket (%s)", scanner_options),
 	    malware_daemon_ctx.sock);
 	  }
+	store_free(drweb_fbuf);
 	}
       else
 	{
@@ -917,7 +917,9 @@ badseek:  err = errno;
 	    return m_panic_defer_3(scanent, CUS callout_address,
 			      US"cannot read report size", malware_daemon_ctx.sock);
 	  drweb_slen = ntohl(drweb_slen);
-	  tmpbuf = store_get(drweb_slen);
+
+	  /* assume tainted, since it is external input */
+	  tmpbuf = store_get(drweb_slen, TRUE);
 
 	  /* read report body */
 	  if (!recv_len(malware_daemon_ctx.sock, tmpbuf, drweb_slen, tmo))
@@ -1463,7 +1465,7 @@ badseek:  err = errno;
 	/* Local file; so we def want to use_scan_command and don't want to try
 	 * passing IP/port combinations */
 	use_scan_command = TRUE;
-	cd = (clamd_address *) store_get(sizeof(clamd_address));
+	cd = (clamd_address *) store_get(sizeof(clamd_address), FALSE);
 
 	/* extract socket-path part */
 	sublist = scanner_options;
@@ -1497,7 +1499,7 @@ badseek:  err = errno;
 	    continue;
 	    }
 
-	  cd = (clamd_address *) store_get(sizeof(clamd_address));
+	  cd = (clamd_address *) store_get(sizeof(clamd_address), FALSE);
 
 	  /* extract host and port part */
 	  sublist = scanner_options;
@@ -1666,7 +1668,7 @@ b_seek:   err = errno;
 	if (lseek(clam_fd, 0, SEEK_SET) < 0)
 	  goto b_seek;
 
-	if (!(clamav_fbuf = US malloc(fsize_uint)))
+	if (!(clamav_fbuf = store_malloc(fsize_uint)))
 	  {
 	  (void)close(clam_fd);
 	  return m_panic_defer_3(scanent, NULL,
@@ -1678,7 +1680,7 @@ b_seek:   err = errno;
 	if ((result = read(clam_fd, clamav_fbuf, fsize_uint)) < 0)
 	  {
 	  int err = errno;
-	  free(clamav_fbuf); (void)close(clam_fd);
+	  store_free(clamav_fbuf); (void)close(clam_fd);
 	  return m_panic_defer_3(scanent, NULL,
 	    string_sprintf("can't read spool file %s: %s",
 	      eml_filename, strerror(err)),
@@ -1693,13 +1695,12 @@ b_seek:   err = errno;
 	    (send(malware_daemon_ctx.sock, clamav_fbuf, fsize_uint, 0) < 0) ||
 	    (send(malware_daemon_ctx.sock, &send_final_zeroblock, sizeof(send_final_zeroblock), 0) < 0))
 	  {
-	  free(clamav_fbuf);
+	  store_free(clamav_fbuf);
 	  return m_panic_defer_3(scanent, NULL,
 	    string_sprintf("unable to send file body to socket (%s)", hostname),
 	    malware_daemon_ctx.sock);
 	  }
-
-	free(clamav_fbuf);
+	store_free(clamav_fbuf);
 	}
       else
 	{ /* use scan command */