Mercurial > illumos > illumos-gate

changeset 2888:fc2d70ab0ffd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6471812 update 3 zones upgrade is failing with SEGV in /bin/sh from memcpy
author craigm
date Mon, 09 Oct 2006 15:17:13 -0700
parents eef7119b31c5
children e054bc71b5d4
files usr/src/cmd/sh/macro.c
diffstat 1 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/sh/macro.c	Mon Oct 09 13:56:27 2006 -0700
+++ b/usr/src/cmd/sh/macro.c	Mon Oct 09 15:17:13 2006 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1995 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -376,7 +375,7 @@
 						newargp = fixstak();
 						assign(n, newargp);
 						tdystak(savptr);
-						memcpy(stakbot, savptr, strlngth);
+						(void) memcpystak(stakbot, savptr, strlngth);
 						staktop = stakbot + strlngth;
 					}
 					else
@@ -510,7 +509,7 @@
 		savpipe = -1;
 	}
 	tdystak(savptr);
-	memcpy(stakbot, savptr, strlngth);
+	(void) memcpystak(stakbot, savptr, strlngth);
 	oldstaktop = staktop = stakbot + strlngth;
 	while (d = readwc()) {
 		if(quote || (d == '\\' && trimflag)) {