 @@ -1,14 +1,14 @@
-/*	$NetBSD: lobject.c,v 1.5 2015/10/08 13:21:00 mbalmer Exp $	*/
+/*	$NetBSD: lobject.c,v 1.6 2015/10/11 01:01:45 christos Exp $	*/
 /*
 ** Id: lobject.c,v 2.104 2015/04/11 18:30:08 roberto Exp
 ** Some generic functions over Lua objects
 ** See Copyright Notice in lua.h
 */
 #define lobject_c
 #define LUA_CORE
 #include "lprefix.h"
 @@ -348,29 +348,29 @@ int luaO_utf8esc (char *buff, unsigned l
 /* maximum length of the conversion of a number to a string */
 #define MAXNUMBER2STR	50
 /*
 ** Convert a number object to a string
 */
 void luaO_tostring (lua_State *L, StkId obj) {
   char buff[MAXNUMBER2STR];
   size_t len;
   lua_assert(ttisnumber(obj));
 #ifndef _KERNEL
   if (ttisinteger(obj))
-    len = lua_integer2str(buff, ivalue(obj));
+    len = lua_integer2str(buff, sizeof(buff), ivalue(obj));
   else {
-    len = lua_number2str(buff, fltvalue(obj));
+    len = lua_number2str(buff, sizeof(buff), fltvalue(obj));
 #if !defined(LUA_COMPAT_FLOATSTRING)
     if (buff[strspn(buff, "-0123456789")] == '\0') {  /* looks like an int? */
       buff[len++] = lua_getlocaledecpoint();
       buff[len++] = '0';  /* adds '.0' to result */
+    }
 #endif
+  }
 #else /* _KERNEL */
   lua_assert(ttisinteger(obj));
   len = lua_integer2str(buff, ivalue(obj));
 #endif
   setsvalue2s(L, obj, luaS_newlstr(L, buff, len));
+}
 @@ -414,27 +414,27 @@ const char *luaO_pushvfstring (lua_State
         setivalue(L->top++, cast(lua_Integer, va_arg(argp, l_uacInt)));
         luaO_tostring(L, L->top - 1);
         break;
+      }
 #ifndef _KERNEL
       case 'f': {
         setfltvalue(L->top++, cast_num(va_arg(argp, l_uacNumber)));
         luaO_tostring(L, L->top - 1);
         break;
+      }
 #endif
       case 'p': {
         char buff[4*sizeof(void *) + 8]; /* should be enough space for a '%p' */
-        int l = sprintf(buff, "%p", va_arg(argp, void *));
+        int l = snprintf(buff, sizeof(buff), "%p", va_arg(argp, void *));
         pushstr(L, buff, l);
         break;
+      }
       case 'U': {
         char buff[UTF8BUFFSZ];
         int l = luaO_utf8esc(buff, cast(long, va_arg(argp, long)));
         pushstr(L, buff + UTF8BUFFSZ - l, l);
         break;
+      }
       case '%': {
         pushstr(L, "%", 1);
         break;
+      }

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lstrlib.c,v 1.9 2015/10/08 13:40:16 mbalmer Exp $	*/
+/*	$NetBSD: lstrlib.c,v 1.10 2015/10/11 01:01:45 christos Exp $	*/
 /*
 ** Id: lstrlib.c,v 1.229 2015/05/20 17:39:23 roberto Exp
 ** Standard library for string operations and pattern-matching
 ** See Copyright Notice in lua.h
 */
 #define lstrlib_c
 #define LUA_LIB
 #include "lprefix.h"
 @@ -824,52 +824,53 @@ static int str_gsub (lua_State *L) {
 /*
 ** Add integer part of 'x' to buffer and return new 'x'
 */
 static lua_Number adddigit (char *buff, int n, lua_Number x) {
   lua_Number dd = l_mathop(floor)(x);  /* get integer part from 'x' */
   int d = (int)dd;
   buff[n] = (d < 10 ? d + '0' : d - 10 + 'a');  /* add to buffer */
   return x - dd;  /* return what is left */
+}
-static int num2straux (char *buff, lua_Number x) {
+static int num2straux (char *buff, size_t len, lua_Number x) {
   if (x != x || x == HUGE_VAL || x == -HUGE_VAL)  /* inf or NaN? */
-    return sprintf(buff, LUA_NUMBER_FMT, x);  /* equal to '%g' */
+    return snprintf(buff, len, LUA_NUMBER_FMT, x);  /* equal to '%g' */
   else if (x == 0) {  /* can be -0... */
-    sprintf(buff, LUA_NUMBER_FMT, x);
+    snprintf(buff, len, LUA_NUMBER_FMT, x);
-    strcat(buff, "x0p+0");  /* reuses '0/-0' from 'sprintf'... */
+    strlcat(buff, "x0p+0", len);  /* reuses '0/-0' from 'snprintf'... */
     return strlen(buff);
+  }
   else {
     int e;
     lua_Number m = l_mathop(frexp)(x, &e);  /* 'x' fraction and exponent */
     int n = 0;  /* character count */
     if (m < 0) {  /* is number negative? */
       buff[n++] = '-';  /* add signal */
       m = -m;  /* make it positive */
+    }
     buff[n++] = '0'; buff[n++] = 'x';  /* add "0x" */
     m = adddigit(buff, n++, m * (1 << L_NBFD));  /* add first digit */
     e -= L_NBFD;  /* this digit goes before the radix point */
     if (m > 0) {  /* more digits? */
       buff[n++] = lua_getlocaledecpoint();  /* add radix point */
       do {  /* add as many digits as needed */
         m = adddigit(buff, n++, m * 16);
       } while (m > 0);
+    }
-    n += sprintf(buff + n, "p%+d", e);  /* add exponent */
+    if (len > (size_t)n)
 	    n += snprintf(buff + n, len - n, "p%+d", e);  /* add exponent */
     return n;
+  }
+}
 static int lua_number2strx (lua_State *L, char *buff, const char *fmt,
                             lua_Number x) {
   int n = num2straux(buff, x);
   if (fmt[SIZELENMOD] == 'A') {
     int i;
     for (i = 0; i < n; i++)
       buff[i] = toupper(uchar(buff[i]));
+  }
 @@ -903,29 +904,29 @@ static int lua_number2strx (lua_State *L
 static void addquoted (lua_State *L, luaL_Buffer *b, int arg) {
   size_t l;
   const char *s = luaL_checklstring(L, arg, &l);
   luaL_addchar(b, '"');
   while (l--) {
     if (*s == '"' || *s == '\\' || *s == '\n') {
       luaL_addchar(b, '\\');
       luaL_addchar(b, *s);
+    }
     else if (*s == '\0' || iscntrl(uchar(*s))) {
       char buff[10];
       if (!isdigit(uchar(*(s+1))))
-        sprintf(buff, "\\%d", (int)uchar(*s));
+        snprintf(buff, sizeof(buff), "\\%d", (int)uchar(*s));
       else
-        sprintf(buff, "\\%03d", (int)uchar(*s));
+        snprintf(buff, sizeof(buff), "\\%03d", (int)uchar(*s));
       luaL_addstring(b, buff);
+    }
     else
       luaL_addchar(b, *s);
     s++;
+  }
   luaL_addchar(b, '"');
+}
 static const char *scanformat (lua_State *L, const char *strfrmt, char *form) {
   const char *p = strfrmt;
   while (*p != '\0' && strchr(FLAGS, *p) != NULL) p++;  /* skip flags */
   if ((size_t)(p - strfrmt) >= sizeof(FLAGS)/sizeof(char))
 @@ -972,62 +973,62 @@ static int str_format (lua_State *L) {
     if (*strfrmt != L_ESC)
       luaL_addchar(&b, *strfrmt++);
     else if (*++strfrmt == L_ESC)
       luaL_addchar(&b, *strfrmt++);  /* %% */
     else { /* format item */
       char form[MAX_FORMAT];  /* to store the format ('%...') */
       char *buff = luaL_prepbuffsize(&b, MAX_ITEM);  /* to put formatted item */
       int nb = 0;  /* number of bytes in added item */
       if (++arg > top)
         luaL_argerror(L, arg, "no value");
       strfrmt = scanformat(L, strfrmt, form);
       switch (*strfrmt++) {
         case 'c': {
-          nb = sprintf(buff, form, (int)luaL_checkinteger(L, arg));
+          nb = snprintf(buff, MAX_ITEM, form, (int)luaL_checkinteger(L, arg));
           break;
+        }
         case 'd': case 'i':
         case 'o': case 'u': case 'x': case 'X': {
           lua_Integer n = luaL_checkinteger(L, arg);
           addlenmod(form, LUA_INTEGER_FRMLEN);
-          nb = sprintf(buff, form, n);
+          nb = snprintf(buff, MAX_ITEM, form, n);
           break;
+        }
 #ifndef _KERNEL
         case 'a': case 'A':
           addlenmod(form, LUA_NUMBER_FRMLEN);
-          nb = lua_number2strx(L, buff, form, luaL_checknumber(L, arg));
+          nb = lua_number2strx(L, buff, MAX_ITEM, form, luaL_checknumber(L, arg));
           break;
         case 'e': case 'E': case 'f':
         case 'g': case 'G': {
           addlenmod(form, LUA_NUMBER_FRMLEN);
-          nb = sprintf(buff, form, luaL_checknumber(L, arg));
+          nb = snprintf(buff, MAX_ITEM, form, luaL_checknumber(L, arg));
           break;
+        }
 #endif
         case 'q': {
           addquoted(L, &b, arg);
           break;
+        }
         case 's': {
           size_t l;
           const char *s = luaL_tolstring(L, arg, &l);
           if (!strchr(form, '.') && l >= 100) {
             /* no precision and string is too long to be formatted;
                keep original string */
             luaL_addvalue(&b);
+          }
           else {
-            nb = sprintf(buff, form, s);
+            nb = snprintf(buff, MAX_ITEM, form, s);
             lua_pop(L, 1);  /* remove result from 'luaL_tolstring' */
+          }
           break;
+        }
         default: {  /* also treat cases 'pnLlh' */
           return luaL_error(L, "invalid option '%%%c' to 'format'",
                                *(strfrmt - 1));
+        }
+      }
       luaL_addsize(&b, nb);
+    }
+  }
   luaL_pushresult(&b);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: luac.c,v 1.4 2015/10/08 13:21:00 mbalmer Exp $	*/
+/*	$NetBSD: luac.c,v 1.5 2015/10/11 01:01:45 christos Exp $	*/
 /*
 ** Id: luac.c,v 1.75 2015/03/12 01:58:27 lhf Exp
 ** Lua compiler (saves bytecodes to files; also lists bytecodes)
 ** See Copyright Notice in lua.h
 */
 #define luac_c
 #define LUA_CORE
 #include "lprefix.h"
 #include <ctype.h>
 @@ -257,27 +257,27 @@ static void PrintConstant(const Proto* f
+{
  const TValue* o=&f->k[i];
  switch (ttype(o))
+ {
   case LUA_TNIL:
 	printf("nil");
 	break;
   case LUA_TBOOLEAN:
 	printf(bvalue(o) ? "true" : "false");
 	break;
   case LUA_TNUMFLT:
+	{
 	char buff[100];
-	sprintf(buff,LUA_NUMBER_FMT,fltvalue(o));
+	snprintf(buff, sizeof(buff), LUA_NUMBER_FMT,fltvalue(o));
 	printf("%s",buff);
 	if (buff[strspn(buff,"-0123456789")]=='\0') printf(".0");
 	break;
+	}
   case LUA_TNUMINT:
 	printf(LUA_INTEGER_FMT,ivalue(o));
 	break;
   case LUA_TSHRSTR: case LUA_TLNGSTR:
 	PrintString(tsvalue(o));
 	break;
   default:				/* cannot happen */
 	printf("? type=%d",ttype(o));
 	break;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: luaconf.h,v 1.14 2015/10/08 13:21:00 mbalmer Exp $	*/
+/*	$NetBSD: luaconf.h,v 1.15 2015/10/11 01:01:45 christos Exp $	*/
 /*
 ** Id: luaconf.h,v 1.251 2015/05/20 17:39:23 roberto Exp
 ** Configuration file for Lua
 ** See Copyright Notice in lua.h
 */
 #ifndef luaconf_h
 #define luaconf_h
 #ifndef _KERNEL
 #include <limits.h>
 @@ -468,27 +468,27 @@
 #define l_mathop(op)		op
 #define lua_str2number(s,p)	strtod((s), (p))
 #else						/* }{ */
 #error "numeric float type not defined"
 #endif					/* } */
 #define l_floor(x)		(l_mathop(floor)(x))
-#define lua_number2str(s,n)	sprintf((s), LUA_NUMBER_FMT, (n))
+#define lua_number2str(s,l, n)	snprintf((s), (l), LUA_NUMBER_FMT, (n))
 /*
 @@ lua_numbertointeger converts a float number to an integer, or
 ** returns 0 if float is not within the range of a lua_Integer.
 ** (The range comparisons are tricky because of rounding. The tests
 ** here assume a two-complement representation, where MININTEGER always
 ** has an exact representation as a float; MAXINTEGER may not have one,
 ** and therefore its conversion to float may have an ill-defined value.)
 */
 #define lua_numbertointeger(n,p) \
   ((n) >= (LUA_NUMBER)(LUA_MININTEGER) && \
    (n) < -(LUA_NUMBER)(LUA_MININTEGER) && \
 @@ -505,27 +505,27 @@
 @@ LUAI_UACINT is the result of an 'usual argument conversion'
 @@ over a lUA_INTEGER.
 @@ LUA_INTEGER_FRMLEN is the length modifier for reading/writing integers.
 @@ LUA_INTEGER_FMT is the format for writing integers.
 @@ LUA_MAXINTEGER is the maximum value for a LUA_INTEGER.
 @@ LUA_MININTEGER is the minimum value for a LUA_INTEGER.
 @@ lua_integer2str converts an integer to a string.
 */
 /* The following definitions are good for most cases here */
 #define LUA_INTEGER_FMT		"%" LUA_INTEGER_FRMLEN "d"
-#define lua_integer2str(s,n)	sprintf((s), LUA_INTEGER_FMT, (n))
+#define lua_integer2str(s,l,n)	snprintf((s), (l), LUA_INTEGER_FMT, (n))
 #define LUAI_UACINT		LUA_INTEGER
 /*
 ** use LUAI_UACINT here to avoid problems with promotions (which
 ** can turn a comparison between unsigneds into a signed comparison)
 */
 #define LUA_UNSIGNED		unsigned LUAI_UACINT
 /* now the variable definitions */
 #if LUA_INT_TYPE == LUA_INT_INT		/* { int */
 @@ -589,32 +589,32 @@
 /*
 @@ lua_strx2number converts an hexadecimal numeric string to a number.
 ** In C99, 'strtod' does that conversion. Otherwise, you can
 ** leave 'lua_strx2number' undefined and Lua will provide its own
 ** implementation.
 */
 #if !defined(LUA_USE_C89)
 #define lua_strx2number(s,p)	lua_str2number(s,p)
 #endif
 /*
 @@ lua_number2strx converts a float to an hexadecimal numeric string.
-** In C99, 'sprintf' (with format specifiers '%a'/'%A') does that.
+** In C99, 'snprintf' (with format specifiers '%a'/'%A') does that.
 ** Otherwise, you can leave 'lua_number2strx' undefined and Lua will
 ** provide its own implementation.
 */
 #if !defined(LUA_USE_C89)
-#define lua_number2strx(L,b,f,n)	sprintf(b,f,n)
+#define lua_number2strx(L,b,l,f,n)	snprintf(b,l,f,n)
 #endif
 /*
 ** 'strtof' and 'opf' variants for math functions are not valid in
 ** C89. Otherwise, the macro 'HUGE_VALF' is a good proxy for testing the
 ** availability of these variants. ('math.h' is already included in
 ** all files that use these macros.)
 */
 #if defined(LUA_USE_C89) || (defined(HUGE_VAL) && !defined(HUGE_VALF))
 #undef l_mathop  /* variants not available */
 #undef lua_str2number
 #define l_mathop(op)		(lua_Number)op  /* no variant */
 @@ -792,27 +792,25 @@
 /* setjmp.h */
 #define LUAI_THROW(L,c)		longjmp(&((c)->b))
 #define LUAI_TRY(L,c,a)		if (setjmp(&((c)->b)) == 0) { a }
 #define luai_jmpbuf		label_t
 /* time.h */
 #include <sys/time.h>
 #define time(p)			(time_uptime)
 /* stdio.h */
 #define lua_writestring(s,l)	printf("%s", (s))
 #define lua_writeline()		printf("\n")
 #define sprintf(s,fmt,...)	snprintf(s, sizeof(s), fmt, __VA_ARGS__)
 /* string.h */
 #define strcoll strcmp
 /* stdlib.h */
 #define abort()			panic("Lua has aborted!")
 #endif /* _KERNEL */
 #endif /* __NetBSD__ */
 #endif