Re: [nmap-svn] r34034 - nmap

[Daniel Miller <bonsaiviking () gmail com>]

jah,

This may be the case for Lua 5.3, but we are still using Lua 5.2 in the
trunk. Please revert this, since it doesn't work (all thread IDs are 0 from
matching "0" in "0xABCD1234"

Dan

On Thu, Feb 19, 2015 at 9:07 PM, <commit-mailer () nmap org> wrote:

> Author: jah
> Date: Fri Feb 20 03:07:04 2015
> New Revision: 34034
>
> Log:
> Fix the creation of the thread.info property.
>
> Update the patterns used to extract hex chars from the string
> representation of a coroutine.  It seems the string has changed in Lua 5.3
> from "0xAB..." to "thread: AB..."; this was before:-
>
> NSE: Starting http-feed M:nil against ...
> NSE: http-feed M:nil spawning new thread (thread: 02C63A78).
> NSE: Finished http-feed W:nil against ...
>
> this is now:-
>
> NSE: Starting http-feed M:02D6EAF0 against ...
> NSE: http-feed M:02D6EAF0 spawning new thread (thread: 02D6E640).
> NSE: Finished http-feed W:02D6E640 against ...
>
>
> Modified:
>    nmap/nse_main.lua
>
> Modified: nmap/nse_main.lua
>
> ==============================================================================
> --- nmap/nse_main.lua   (original)
> +++ nmap/nse_main.lua   Fri Feb 20 03:07:04 2015
> @@ -467,7 +467,7 @@
>        co = co,
>        env = env,
>        identifier = tostring(co),
> -      info = format("%s M:%s", self.id, match(tostring(co), "0x(.*)"));
> +      info = format("%s M:%s", self.id, match(tostring(co), "thread:
> (%x+)"));
>        parent = nil, -- placeholder
>        script = self,
>        type = script_type,
> @@ -485,7 +485,7 @@
>        args = pack(...),
>        close_handlers = {},
>        co = co,
> -      info = format("%s W:%s", self.id, match(tostring(co), "0x(.*)"));
> +      info = format("%s W:%s", self.id, match(tostring(co), "thread:
> (%x+)"));
>        parent = self,
>        worker = true,
>      };
>
> _______________________________________________
> Sent through the svn mailing list
> http://nmap.org/mailman/listinfo/svn
_______________________________________________
Sent through the dev mailing list
https://nmap.org/mailman/listinfo/dev
Archived at http://seclists.org/nmap-dev/