Attachment #159291 for bug #230443

Lines 7347-7353 Link Here

(-)nmap-4.68-orig/configure (-1 / +1 lines)
7347		7347
7348	# They don't want lua	7348	# They don't want lua
7349	if test "$no_lua" = "yes"; then	7349	if test "$no_lua" = "yes"; then
7350	CXXFLAGS="-DNOLUA $CXXFLAGS"	7350	CPPFLAGS="-DNOLUA $CPPFLAGS"
7351	LIBLUA_LIBS=""	7351	LIBLUA_LIBS=""
7352	LUA_DEPENDS=""	7352	LUA_DEPENDS=""
7353	LUA_BUILD=""	7353	LUA_BUILD=""

Lines 524-530 Link Here

(-)nmap-4.68-orig/configure.ac (-1 / +1 lines)
524		524
525	# They don't want lua	525	# They don't want lua
526	if test "$no_lua" = "yes"; then	526	if test "$no_lua" = "yes"; then
527	CXXFLAGS="-DNOLUA $CXXFLAGS"	527	CPPFLAGS="-DNOLUA $CPPFLAGS"
528	LIBLUA_LIBS=""	528	LIBLUA_LIBS=""
529	LUA_DEPENDS=""	529	LUA_DEPENDS=""
530	LUA_BUILD=""	530	LUA_BUILD=""

Lines 457-465 Link Here

(-)nmap-4.68-orig/NmapOps.cc (+2 lines)
457	if(ipoptions && osscan)	457	if(ipoptions && osscan)
458	error("WARNING: Ip options are NOT used while OS scanning!");	458	error("WARNING: Ip options are NOT used while OS scanning!");
459		459
		460	#ifndef NOLUA
460	/* Make sure nmap.registry.args is available (even if it's empty) */	461	/* Make sure nmap.registry.args is available (even if it's empty) */
461	if (!scriptargs)	462	if (!scriptargs)
462	scriptargs = strdup("");	463	scriptargs = strdup("");
		464	#endif
463	}	465	}
464		466
465	void NmapOps::setMaxOSTries(int mot) {	467	void NmapOps::setMaxOSTries(int mot) {





  if (FPR) delete FPR;

#ifndef NOLUA
  if (o.script) {
    ScriptResults::iterator sriter;
    for (sriter = scriptResults.begin(); sriter != scriptResults.end(); sriter++)
      free((*sriter).id);
  }
#endif
}

/*  Creates a "presentation" formatted string out of the IPv4/IPv6 address.

Lines 1899-1905 Link Here

(-)nmap-4.68-orig/nmap.cc (+2 lines)
1899	if (o.dns_servers) free(o.dns_servers);	1899	if (o.dns_servers) free(o.dns_servers);
1900	if (o.extra_payload) free(o.extra_payload);	1900	if (o.extra_payload) free(o.extra_payload);
1901	if (o.ipoptions) free(o.ipoptions);	1901	if (o.ipoptions) free(o.ipoptions);
		1902	#ifndef NOLUA
1902	free(o.scriptargs);	1903	free(o.scriptargs);
		1904	#endif
1903	}	1905	}
1904		1906
1905	/* Reads in a (normal or machine format) Nmap log file and gathers enough	1907	/* Reads in a (normal or machine format) Nmap log file and gathers enough




#ifndef NMAP_LUA_H
#define NMAP_LUA_H

#ifndef NOLUA
extern "C" {
  #include "lua.h"
  #include "lualib.h"
  #include "lauxlib.h"
}
#endif

#include <vector>
#include <list>




   free(serviceprobe_service);
 if (serviceprobe_fp)
   free(serviceprobe_fp);
#ifndef NOLUA
 if (o.script) {
   ScriptResults::iterator sriter;
   for (sriter = scriptResults.begin(); sriter != scriptResults.end(); sriter++)
     free((*sriter).id);
 }
#endif
}

// Uses the sd->{product,version,extrainfo} if available to fill

Return to bug 230443

Lines 179-189 Link Here

(-)nmap-4.68-orig/Target.cc (+2 lines)
179		179
180	if (FPR) delete FPR;	180	if (FPR) delete FPR;
181		181
		182	#ifndef NOLUA
182	if (o.script) {	183	if (o.script) {
183	ScriptResults::iterator sriter;	184	ScriptResults::iterator sriter;
184	for (sriter = scriptResults.begin(); sriter != scriptResults.end(); sriter++)	185	for (sriter = scriptResults.begin(); sriter != scriptResults.end(); sriter++)
185	free((*sriter).id);	186	free((*sriter).id);
186	}	187	}
		188	#endif
187	}	189	}
188		190
189	/* Creates a "presentation" formatted string out of the IPv4/IPv6 address.	191	/* Creates a "presentation" formatted string out of the IPv4/IPv6 address.

Lines 150-160 Link Here

(-)nmap-4.68-orig/portlist.cc (+2 lines)
150	free(serviceprobe_service);	150	free(serviceprobe_service);
151	if (serviceprobe_fp)	151	if (serviceprobe_fp)
152	free(serviceprobe_fp);	152	free(serviceprobe_fp);
		153	#ifndef NOLUA
153	if (o.script) {	154	if (o.script) {
154	ScriptResults::iterator sriter;	155	ScriptResults::iterator sriter;
155	for (sriter = scriptResults.begin(); sriter != scriptResults.end(); sriter++)	156	for (sriter = scriptResults.begin(); sriter != scriptResults.end(); sriter++)
156	free((*sriter).id);	157	free((*sriter).id);
157	}	158	}
		159	#endif
158	}	160	}
159		161
160	// Uses the sd->{product,version,extrainfo} if available to fill	162	// Uses the sd->{product,version,extrainfo} if available to fill

Lines 1-11 Link Here

(-)nmap-4.68-orig/nse_main.h (+2 lines)
1	#ifndef NMAP_LUA_H	1	#ifndef NMAP_LUA_H
2	#define NMAP_LUA_H	2	#define NMAP_LUA_H
3		3
		4	#ifndef NOLUA
4	extern "C" {	5	extern "C" {
5	#include "lua.h"	6	#include "lua.h"
6	#include "lualib.h"	7	#include "lualib.h"
7	#include "lauxlib.h"	8	#include "lauxlib.h"
8	}	9	}
		10	#endif
9		11
10	#include <vector>	12	#include <vector>
11	#include <list>	13	#include <list>