Re: Nmap on Android: bitset

[Kris Katterjohn <katterjohn () gmail com>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 08/19/2010 11:58 PM, David Fifield wrote:
> I just committed the libdnet-stripped change and the OpenSSL change in
> pending. That leaves only this in liblua:
>
> --- nmap-5.35DC1.orig/liblua/llex.c     2008-05-31 03:43:43.000000000 +0200
> +++ nmap-5.35DC1/liblua/llex.c  2010-07-26 14:34:56.458742697 +0200
> @@ -176,9 +176,14 @@
>
>  static void trydecpoint (LexState *ls, SemInfo *seminfo) {
>    /* format error: try to update decimal point separator */
> +
> +#ifdef BIONIC
> +       ls->decpoint = '.';
> +# else
>    struct lconv *cv = localeconv();
> -  char old = ls->decpoint;
>    ls->decpoint = (cv ? cv->decimal_point[0] : '.');
> +#endif
> +  char old = ls->decpoint;
>    buffreplace(ls, old, ls->decpoint);  /* try updated decimal separator */
>    if (!luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r)) {
>      /* format error with correct decimal point: no more options */

I know a non-conditional workaround will probably be implemented in lieu of
this patch (and I agree), but just in case: this looks wrong.  I'm not
familiar at all with this function, but I'm thinking about the "old" variable
which would (regardless of BIONIC) now contain ls->decpoint's current value,
not the previous (old) one as before.

> David Fifield

Cheers,
Kris Katterjohn

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJMbhA0AAoJEEQxgFs5kUfuahYP/1TZu0mgSHULc0WePZ4qENSw
9mKXUrCWnmJjxNIsc62YbrpQeVVpMiWLGA3jxNma1xVSkxjzKZq5SpqVZ+Cttmgc
PDim5BGYfLNVp+hKpUFb2AAaROW+NtqdQpdjSt27QDJogPh92kiAn6oazswC6hdC
rhmizfZoRuuvWsyRgqViUMp8RtRpi5p0f+ZvruHc5rG4Zs3dr9icOQjEedt+AiKh
FURhWP0CKhl0c9XRS2+SKW6GoI2c/MpYH9RY4zyyEm1zGU23CjyMD2DYLvo4GmRK
qwYshYHAjlrAhP44kMsuXnqTTRx7CwgJtnET7j6iRXDjdoWfjdwF4kRbwWFubONj
/uyPHTCakaDmSbEf4KYFMCQ80J7YoxQN0XEXJbwJlzQ+WxmGY0XcIGGNrzfpooQ+
OOejT4Teq3/oIOEqxsdHP5lV9yvbvZSSPOQaRyiQ+jDHkzQt6gF7IQhtOAv6F7Hf
6ffiqFU6PHH4SQ9CdhzOenrY59LjG8tuxBQ7oXtFhKdkj72AQrHQyj31eU11RLuD
ZV2L7ITEcsbf4ZVArgRhXRgLsqsFFvuNSPXOTi8tUPWyY8eC5O7xa916Z5gcxvAm
Z/9HBk6xbcThsosqUp45sypc7N7Ej88bEqlZ1BgcHj/KD0h1b01TOZYc4MzKqCuF
FnivIoIoxfZf0BN4yTL0
=9a6z
-----END PGP SIGNATURE-----
_______________________________________________
Sent through the nmap-dev mailing list
http://cgi.insecure.org/mailman/listinfo/nmap-dev
Archived at http://seclists.org/nmap-dev/