Use Lua integers in more places where floats are unexpected. Fixes nmap#1647

bonsaiviking · bonsaiviking · commit 73ce19e7b640 · 2019-06-26T20:13:43.000Z
diff --git a/nse_nmaplib.cc b/nse_nmaplib.cc
@@ -663,7 +663,7 @@ static int l_get_version_intensity (lua_State *L)
   lua_pop(L,1);
 
   if (selected_by_name) {
-    lua_pushnumber(L, max_intensity);
+    lua_pushinteger(L, max_intensity);
     return 1;
   }
 
@@ -690,7 +690,7 @@ static int l_get_version_intensity (lua_State *L)
     }
   }
 
-  lua_pushnumber(L, intensity);
+  lua_pushinteger(L, intensity);
 
   return 1;
 }
@@ -704,13 +704,13 @@ static int l_get_verbosity (lua_State *L)
      we lie to it and say the verbosity is one higher than it really is. */
   verbosity += (nse_selectedbyname(L), lua_toboolean(L, -1) ? 1 : 0);
 
-  lua_pushnumber(L, verbosity);
+  lua_pushinteger(L, verbosity);
   return 1;
 }
 
 static int l_get_debugging (lua_State *L)
 {
-  lua_pushnumber(L, o.debugging);
+  lua_pushinteger(L, o.debugging);
   return 1;
 }
 
@@ -735,7 +735,7 @@ static int l_fetchfile (lua_State *L)
 
 static int l_get_timing_level (lua_State *L)
 {
-  lua_pushnumber(L, o.timing_level);
+  lua_pushinteger(L, o.timing_level);
   return 1;
 }
 
@@ -767,26 +767,26 @@ static int l_add_targets (lua_State *L)
     }
     /* was able to add some targets */
     if (ntarget) {
-      lua_pushnumber(L, ntarget);
+      lua_pushinteger(L, ntarget);
       return 1;
     /* errors */
     } else {
-      lua_pushnumber(L, ntarget);
+      lua_pushinteger(L, ntarget);
       lua_pushstring(L, "failed to add new targets.");
       return 2;
     }
   } else {
       /* function called without arguments */
       /* push the number of pending targets that are in the queue */
-      lua_pushnumber(L, NewTargets::insert(""));
+      lua_pushinteger(L, NewTargets::insert(""));
       return 1;
   }
 }
 
 /* Return the number of added targets */
 static int l_get_new_targets_num (lua_State *L)
 {
-  lua_pushnumber(L, NewTargets::get_number());
+  lua_pushinteger(L, NewTargets::get_number());
   return 1;
 }
 
@@ -943,9 +943,9 @@ static int l_list_interfaces (lua_State *L)
 static int l_get_ttl (lua_State *L)
 {
   if (o.ttl < 0 || o.ttl > 255)
-    lua_pushnumber(L, 64); //default TTL
+    lua_pushinteger(L, 64); //default TTL
   else
-    lua_pushnumber(L, o.ttl);
+    lua_pushinteger(L, o.ttl);
   return 1;
 }
 
@@ -956,9 +956,9 @@ static int l_get_ttl (lua_State *L)
 static int l_get_payload_length(lua_State *L)
 {
   if (o.extra_payload_length < 0)
-    lua_pushnumber(L, 0); //default payload length
+    lua_pushinteger(L, 0); //default payload length
   else
-    lua_pushnumber(L, o.extra_payload_length);
+    lua_pushinteger(L, o.extra_payload_length);
   return 1;
 }
 
diff --git a/nse_openssl.cc b/nse_openssl.cc
@@ -139,14 +139,14 @@ static int l_bignum_add( lua_State *L ) /** bignum_add( BIGNUM a, BIGNUM b ) */
 static int l_bignum_num_bits( lua_State *L ) /** bignum_num_bits( BIGNUM bn ) */
 {
   bignum_data_t * userdata = (bignum_data_t *) luaL_checkudata(L, 1, "BIGNUM");
-  lua_pushnumber( L, BN_num_bits( userdata->bn) );
+  lua_pushinteger( L, BN_num_bits( userdata->bn) );
   return 1;
 }
 
 static int l_bignum_num_bytes( lua_State *L ) /** bignum_num_bytes( BIGNUM bn ) */
 {
   bignum_data_t * userdata = (bignum_data_t *) luaL_checkudata(L, 1, "BIGNUM");
-  lua_pushnumber( L, BN_num_bytes( userdata->bn) );
+  lua_pushinteger( L, BN_num_bytes( userdata->bn) );
   return 1;
 }
 
diff --git a/nse_pcrelib.cc b/nse_pcrelib.cc
@@ -53,15 +53,15 @@ static int udata_tostring (lua_State *L, const char* type_handle,
         return 1;
 }
 
-typedef struct { const char* key; lua_Number val; } flags_pair;
+typedef struct { const char* key; lua_Integer val; } flags_pair;
 
 static int get_flags (lua_State *L, const flags_pair *arr)
 {
         const flags_pair *p;
         lua_newtable(L);
         for(p=arr; p->key != NULL; p++) {
                 lua_pushstring(L, p->key);
-                lua_pushnumber(L, p->val);
+                lua_pushinteger(L, p->val);
                 lua_rawset(L, -3);
         }
         return 1;
@@ -200,9 +200,9 @@ static void Lpcre_push_offsets (lua_State *L, const char *text, pcre2 * ud)
         for (i=1, j=1; i <= (unsigned) ud->ncapt; i++) {
                 k = i * 2;
                 if (ud->match[k] >= 0) {
-                        lua_pushnumber(L, ud->match[k] + 1);
+                        lua_pushinteger(L, ud->match[k] + 1);
                         lua_rawseti(L, -2, j++);
-                        lua_pushnumber(L, ud->match[k+1]);
+                        lua_pushinteger(L, ud->match[k+1]);
                         lua_rawseti(L, -2, j++);
                 }
                 else {
@@ -229,8 +229,8 @@ static int Lpcre_match_generic(lua_State *L, Lpcre_push_matches push_matches)
         res = pcre_exec(ud->pr, ud->extra, text, (int)elen, startoffset, eflags,
                         ud->match, (ud->ncapt + 1) * 3);
         if (res >= 0) {
-                lua_pushnumber(L, (lua_Number) ud->match[0] + 1);
-                lua_pushnumber(L, (lua_Number) ud->match[1]);
+                lua_pushinteger(L, (lua_Number) ud->match[0] + 1);
+                lua_pushinteger(L, (lua_Number) ud->match[1]);
                 (*push_matches)(L, text, ud);
                 return 3;
         }
@@ -279,7 +279,7 @@ static int Lpcre_gmatch(lua_State *L)
                 } else
                         break;
         }
-        lua_pushnumber(L, nmatch);
+        lua_pushinteger(L, nmatch);
         return 1;
 }
 
diff --git a/nse_ssl_cert.cc b/nse_ssl_cert.cc
@@ -419,18 +419,18 @@ static void tm_to_table(lua_State *L, const struct tm *tm)
 #define NSE_NUM_TM_FIELDS 6
   lua_createtable(L, 0, NSE_NUM_TM_FIELDS);
 
-  lua_pushnumber(L, tm->tm_year);
+  lua_pushinteger(L, tm->tm_year);
   lua_setfield(L, -2, "year");
   /* Lua uses one-indexed months. */
-  lua_pushnumber(L, tm->tm_mon + 1);
+  lua_pushinteger(L, tm->tm_mon + 1);
   lua_setfield(L, -2, "month");
-  lua_pushnumber(L, tm->tm_mday);
+  lua_pushinteger(L, tm->tm_mday);
   lua_setfield(L, -2, "day");
-  lua_pushnumber(L, tm->tm_hour);
+  lua_pushinteger(L, tm->tm_hour);
   lua_setfield(L, -2, "hour");
-  lua_pushnumber(L, tm->tm_min);
+  lua_pushinteger(L, tm->tm_min);
   lua_setfield(L, -2, "min");
-  lua_pushnumber(L, tm->tm_sec);
+  lua_pushinteger(L, tm->tm_sec);
   lua_setfield(L, -2, "sec");
   /* Omit tm_wday and tm_yday. */
 }

Original file line number	Diff line number	Diff line change
`@@ -663,7 +663,7 @@ static int l_get_version_intensity (lua_State *L)`
`663`	`663`	`lua_pop(L,1);`
`664`	`664`
`665`	`665`	`if (selected_by_name) {`
`666`		`- lua_pushnumber(L, max_intensity);`
	`666`	`+ lua_pushinteger(L, max_intensity);`
`667`	`667`	`return 1;`
`668`	`668`	`}`
`669`	`669`
`@@ -690,7 +690,7 @@ static int l_get_version_intensity (lua_State *L)`
`690`	`690`	`}`
`691`	`691`	`}`
`692`	`692`
`693`		`- lua_pushnumber(L, intensity);`
	`693`	`+ lua_pushinteger(L, intensity);`
`694`	`694`
`695`	`695`	`return 1;`
`696`	`696`	`}`
`@@ -704,13 +704,13 @@ static int l_get_verbosity (lua_State *L)`
`704`	`704`	`we lie to it and say the verbosity is one higher than it really is. */`
`705`	`705`	`verbosity += (nse_selectedbyname(L), lua_toboolean(L, -1) ? 1 : 0);`
`706`	`706`
`707`		`- lua_pushnumber(L, verbosity);`
	`707`	`+ lua_pushinteger(L, verbosity);`
`708`	`708`	`return 1;`
`709`	`709`	`}`
`710`	`710`
`711`	`711`	`static int l_get_debugging (lua_State *L)`
`712`	`712`	`{`
`713`		`- lua_pushnumber(L, o.debugging);`
	`713`	`+ lua_pushinteger(L, o.debugging);`
`714`	`714`	`return 1;`
`715`	`715`	`}`
`716`	`716`
`@@ -735,7 +735,7 @@ static int l_fetchfile (lua_State *L)`
`735`	`735`
`736`	`736`	`static int l_get_timing_level (lua_State *L)`
`737`	`737`	`{`
`738`		`- lua_pushnumber(L, o.timing_level);`
	`738`	`+ lua_pushinteger(L, o.timing_level);`
`739`	`739`	`return 1;`
`740`	`740`	`}`
`741`	`741`
`@@ -767,26 +767,26 @@ static int l_add_targets (lua_State *L)`
`767`	`767`	`}`
`768`	`768`	`/* was able to add some targets */`
`769`	`769`	`if (ntarget) {`
`770`		`- lua_pushnumber(L, ntarget);`
	`770`	`+ lua_pushinteger(L, ntarget);`
`771`	`771`	`return 1;`
`772`	`772`	`/* errors */`
`773`	`773`	`} else {`
`774`		`- lua_pushnumber(L, ntarget);`
	`774`	`+ lua_pushinteger(L, ntarget);`
`775`	`775`	`lua_pushstring(L, "failed to add new targets.");`
`776`	`776`	`return 2;`
`777`	`777`	`}`
`778`	`778`	`} else {`
`779`	`779`	`/* function called without arguments */`
`780`	`780`	`/* push the number of pending targets that are in the queue */`
`781`		`- lua_pushnumber(L, NewTargets::insert(""));`
	`781`	`+ lua_pushinteger(L, NewTargets::insert(""));`
`782`	`782`	`return 1;`
`783`	`783`	`}`
`784`	`784`	`}`
`785`	`785`
`786`	`786`	`/* Return the number of added targets */`
`787`	`787`	`static int l_get_new_targets_num (lua_State *L)`
`788`	`788`	`{`
`789`		`- lua_pushnumber(L, NewTargets::get_number());`
	`789`	`+ lua_pushinteger(L, NewTargets::get_number());`
`790`	`790`	`return 1;`
`791`	`791`	`}`
`792`	`792`
`@@ -943,9 +943,9 @@ static int l_list_interfaces (lua_State *L)`
`943`	`943`	`static int l_get_ttl (lua_State *L)`
`944`	`944`	`{`
`945`	`945`	`if (o.ttl < 0 \|\| o.ttl > 255)`
`946`		`- lua_pushnumber(L, 64); //default TTL`
	`946`	`+ lua_pushinteger(L, 64); //default TTL`
`947`	`947`	`else`
`948`		`- lua_pushnumber(L, o.ttl);`
	`948`	`+ lua_pushinteger(L, o.ttl);`
`949`	`949`	`return 1;`
`950`	`950`	`}`
`951`	`951`
`@@ -956,9 +956,9 @@ static int l_get_ttl (lua_State *L)`
`956`	`956`	`static int l_get_payload_length(lua_State *L)`
`957`	`957`	`{`
`958`	`958`	`if (o.extra_payload_length < 0)`
`959`		`- lua_pushnumber(L, 0); //default payload length`
	`959`	`+ lua_pushinteger(L, 0); //default payload length`
`960`	`960`	`else`
`961`		`- lua_pushnumber(L, o.extra_payload_length);`
	`961`	`+ lua_pushinteger(L, o.extra_payload_length);`
`962`	`962`	`return 1;`
`963`	`963`	`}`
`964`	`964`
Original file line number	Diff line number	Diff line change
`@@ -139,14 +139,14 @@ static int l_bignum_add( lua_State L ) /* bignum_add( BIGNUM a, BIGNUM b ) */`
`139`	`139`	`static int l_bignum_num_bits( lua_State L ) /* bignum_num_bits( BIGNUM bn ) */`
`140`	`140`	`{`
`141`	`141`	`bignum_data_t * userdata = (bignum_data_t *) luaL_checkudata(L, 1, "BIGNUM");`
`142`		`- lua_pushnumber( L, BN_num_bits( userdata->bn) );`
	`142`	`+ lua_pushinteger( L, BN_num_bits( userdata->bn) );`
`143`	`143`	`return 1;`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`static int l_bignum_num_bytes( lua_State L ) /* bignum_num_bytes( BIGNUM bn ) */`
`147`	`147`	`{`
`148`	`148`	`bignum_data_t * userdata = (bignum_data_t *) luaL_checkudata(L, 1, "BIGNUM");`
`149`		`- lua_pushnumber( L, BN_num_bytes( userdata->bn) );`
	`149`	`+ lua_pushinteger( L, BN_num_bytes( userdata->bn) );`
`150`	`150`	`return 1;`
`151`	`151`	`}`
`152`	`152`