Attachment #331280 for bug #445752





Target::~Target() {
  FreeInternal();
#ifndef NOLUA
  while (!scriptResults.empty()) {
    scriptResults.front().clear();
    scriptResults.pop_front();
  }
#endif
}

void Target::FreeInternal() {

Lines 2612-2618 Link Here

(-)nmap-6.25.org/output.cc (-3 / +2 lines)
2612	}	2612	}
2613	}	2613	}
2614	}	2614	}
2615		2615	#ifndef NOLUA
2616	/*This is a helper function to determine the ordering of the script results	2616	/*This is a helper function to determine the ordering of the script results
2617	based on their id */	2617	based on their id */
2618	bool comparescriptids(ScriptResult first, ScriptResult second){	2618	bool comparescriptids(ScriptResult first, ScriptResult second){
Lines 2625-2629 Link Here
2625	else	2625	else
2626	return false;	2626	return false;
2627	}	2627	}
2628		2628	#endif
2629

Lines 253-260 Link Here

(-)nmap-6.25.org/output.h (+2 lines)
253	were found. */	253	were found. */
254	void printdatafilepaths();	254	void printdatafilepaths();
255		255
		256	#ifndef NOLUA
256	/*This is a helper function to determine the ordering of the script results	257	/*This is a helper function to determine the ordering of the script results
257	based on their id */	258	based on their id */
258	bool comparescriptids(ScriptResult first, ScriptResult second);	259	bool comparescriptids(ScriptResult first, ScriptResult second);
		260	#endif
259		261
260	#endif /* OUTPUT_H */	262	#endif /* OUTPUT_H */

Lines 143-149 Link Here

(-)nmap-6.25.org/portlist.cc (-2 / +2 lines)
143	delete service;	143	delete service;
144	}	144	}
145	}	145	}
146		146	#ifndef NOLUA
147	void Port::freeScriptResults(void)	147	void Port::freeScriptResults(void)
148	{	148	{
149	while (!scriptResults.empty()) {	149	while (!scriptResults.empty()) {
Lines 151-157 Link Here
151	scriptResults.pop_front();	151	scriptResults.pop_front();
152	}	152	}
153	}	153	}
154		154	#endif
155	/* Fills in namebuf (as long as there is space in buflen) with the	155	/* Fills in namebuf (as long as there is space in buflen) with the
156	Name nmap normal output will use to describe the port. This takes	156	Name nmap normal output will use to describe the port. This takes
157	into account to confidence level, any SSL tunneling, etc. Truncates	157	into account to confidence level, any SSL tunneling, etc. Truncates

Lines 171-177 Link Here

(-)nmap-6.25.org/portlist.h (+2 lines)
171	public:	171	public:
172	Port();	172	Port();
173	void freeService(bool del_service);	173	void freeService(bool del_service);
		174	#ifndef NOLUA
174	void freeScriptResults(void);	175	void freeScriptResults(void);
		176	#endif
175	void getNmapServiceName(char *namebuf, int buflen) const;	177	void getNmapServiceName(char *namebuf, int buflen) const;
176		178
177	u16 portno;	179	u16 portno;

Return to bug 445752

Lines 162-171 Link Here

(-)nmap-6.25.org/Target.cc (+2 lines)
162		162
163	Target::~Target() {	163	Target::~Target() {
164	FreeInternal();	164	FreeInternal();
		165	#ifndef NOLUA
165	while (!scriptResults.empty()) {	166	while (!scriptResults.empty()) {
166	scriptResults.front().clear();	167	scriptResults.front().clear();
167	scriptResults.pop_front();	168	scriptResults.pop_front();
168	}	169	}
		170	#endif
169	}	171	}
170		172
171	void Target::FreeInternal() {	173	void Target::FreeInternal() {