Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 1 Dec 2014 02:59:05 +0000 (UTC)
From:      Kevin Lo <kevlo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r275348 - stable/10/usr.bin/dc
Message-ID:  <201412010259.sB12x5UA047559@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kevlo
Date: Mon Dec  1 02:59:05 2014
New Revision: 275348
URL: https://svnweb.freebsd.org/changeset/base/275348

Log:
  MFC r275162:
  Init array field in the proper place.
  
  Obtained from:	OpenBSD

Modified:
  stable/10/usr.bin/dc/stack.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/dc/stack.c
==============================================================================
--- stable/10/usr.bin/dc/stack.c	Sun Nov 30 20:20:55 2014	(r275347)
+++ stable/10/usr.bin/dc/stack.c	Mon Dec  1 02:59:05 2014	(r275348)
@@ -137,14 +137,12 @@ stack_swap(struct stack *stack)
 static void
 stack_grow(struct stack *stack)
 {
-	size_t i, new_size;
+	size_t new_size;
 
 	if (++stack->sp == stack->size) {
 		new_size = stack->size * 2 + 1;
 		stack->stack = brealloc(stack->stack,
 		    new_size * sizeof(*stack->stack));
-		for (i = stack->size; i < new_size; i++)
-			stack->stack[i].array = NULL;
 		stack->size = new_size;
 	}
 }
@@ -156,6 +154,7 @@ stack_pushnumber(struct stack *stack, st
 	stack_grow(stack);
 	stack->stack[stack->sp].type = BCODE_NUMBER;
 	stack->stack[stack->sp].u.num = b;
+	stack->stack[stack->sp].array = NULL;
 }
 
 void
@@ -165,6 +164,7 @@ stack_pushstring(struct stack *stack, ch
 	stack_grow(stack);
 	stack->stack[stack->sp].type = BCODE_STRING;
 	stack->stack[stack->sp].u.string = string;
+	stack->stack[stack->sp].array = NULL;
 }
 
 void



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412010259.sB12x5UA047559>