diff -urpb nmap-3.78/main.cc nmap-3.78mm/main.cc
--- nmap-3.78/main.cc	2004-08-29 11:12:03.000000000 +0200
+++ nmap-3.78mm/main.cc	2004-12-19 13:33:09.000000000 +0100
@@ -207,7 +207,9 @@ int main(int argc, char *argv[], char *e
   } else nmapcalledas++;
 
   if ((cptr = getenv("NMAP_ARGS"))) {
-    snprintf(command, sizeof(command), "nmap %s", cptr);
+    if (snprintf(command, sizeof(command), "nmap %s", cptr) >= (int) sizeof(command)) {
+        error("Warning: NMAP_ARGS variable is too long, truncated");
+    }
     myargc = arg_parse(command, &myargv);
     if (myargc < 1) {
       fatal("NMAP_ARG variable could not be parsed");
diff -urpb nmap-3.78/nmap.cc nmap-3.78mm/nmap.cc
--- nmap-3.78/nmap.cc	2004-12-12 01:46:18.000000000 +0100
+++ nmap-3.78mm/nmap.cc	2004-12-19 13:30:43.000000000 +0100
@@ -309,7 +310,7 @@ int nmap_main(int argc, char *argv[]) {
     case 0:
       if (strcmp(long_options[option_index].name, "max_rtt_timeout") == 0) {
 	o.setMaxRttTimeout(atoi(optarg));
-	if (o.maxRttTimeout() <= 5) {
+	if (o.maxRttTimeout() < 5) {
 	  fatal("max_rtt_timeout is given in milliseconds and must be at least 5");
 	}       
         if (o.maxRttTimeout() < 20) {
diff -urpb nmap-3.78/scan_engine.cc nmap-3.78mm/scan_engine.cc
--- nmap-3.78/scan_engine.cc	2004-11-24 21:13:01.000000000 +0100
+++ nmap-3.78mm/scan_engine.cc	2004-12-19 13:30:43.000000000 +0100
@@ -2468,7 +2474,7 @@ static bool get_pcap_result(UltraScanInf
 	      tcp->th_seq != ipp->tcp->th_seq)
 	    continue;
 	} else if (ip2->ip_p == IPPROTO_UDP && !USI->prot_scan) {
-	  /* TOOD: IPID verification */
+	  /* TODO: IPID verification */
 	  udp = (udphdr_bsd *) ((u8 *) ip2 + ip->ip_hl * 4);
 	  if (udp->uh_sport != ipp->udp->uh_sport || 
 	      udp->uh_dport != ipp->udp->uh_dport)