upstream commit

Do not cast result of malloc/calloc/realloc* if stdlib.h
 is in scope ok krw millert

Upstream-ID: 5e50ded78cadf3841556649a16cc4b1cb6c58667

1 files changed, 3 insertions, 3 deletions

diff --git a/sftp.c b/sftp.c
index cb9b967ed..788601a8d 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.170 2015/01/20 23:14:00 deraadt Exp $ */
+/* $OpenBSD: sftp.c,v 1.171 2015/08/20 22:32:42 deraadt Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -1958,7 +1958,7 @@ complete(EditLine *el, int ch)
 
         /* Figure out which argument the cursor points to */
         cursor = lf->cursor - lf->buffer;
-        line = (char *)xmalloc(cursor + 1);
+        line = xmalloc(cursor + 1);
         memcpy(line, lf->buffer, cursor);
         line[cursor] = '\0';
         argv = makeargv(line, &carg, 1, &quote, &terminated);
@@ -1966,7 +1966,7 @@ complete(EditLine *el, int ch)
 
         /* Get all the arguments on the line */
         len = lf->lastchar - lf->buffer;
-        line = (char *)xmalloc(len + 1);
+        line = xmalloc(len + 1);
         memcpy(line, lf->buffer, len);
         line[len] = '\0';
         argv = makeargv(line, &argc, 1, NULL, NULL);