Fix improper parsing of octal bytes

Author: rs

lib/netmask.coffee

@@ -9,8 +9,14 @@ ip2long = (ip) ->
     b = (ip + '').split('.');
     if b.length is 0 or b.length > 4 then throw new Error('Invalid IP')
     for byte, i in b
-        if isNaN parseInt(byte, 10) then throw new Error("Invalid byte: #{byte}")
+        if byte and byte[0] == '0'
+            # make sure 0 prefixed bytes are parsed as octal
+            byte = parseInt(byte, 8)
+        else
+            byte = parseInt(byte, 10)
+        if isNaN(byte) then throw new Error("Invalid byte: #{byte}")
         if byte < 0 or byte > 255 then throw new Error("Invalid byte: #{byte}")
+        b[i] = byte
     return ((b[0] or 0) << 24 | (b[1] or 0) << 16 | (b[2] or 0) << 8 | (b[3] or 0)) >>> 0
 
 

package.json

@@ -6,24 +6,29 @@
     "homepage": "https://github.com/rs/node-netmask",
     "bugs": "https://github.com/rs/node-netmask/issues",
     "license": "MIT",
-    "repository":
-    {
+    "repository": {
         "type": "git",
         "url": "git://github.com/rs/node-netmask.git"
     },
-    "keywords": ["net", "mask", "ip", "network", "cidr", "netmask", "subnet", "ipcalc"],
+    "keywords": [
+        "net",
+        "mask",
+        "ip",
+        "network",
+        "cidr",
+        "netmask",
+        "subnet",
+        "ipcalc"
+    ],
     "main": "./lib/netmask",
-    "scripts":
-    {
+    "scripts": {
         "prepublish": "coffee -c lib/*.coffee",
         "test": "vows --spec test/*"
     },
-    "engines":
-    {
+    "engines": {
         "node": ">= 0.4.0"
     },
-    "devDependencies":
-    {
+    "devDependencies": {
         "coffee-script": ">=1.2.0",
         "vows": "*"
     }

test/netmasks.coffee

@@ -53,6 +53,14 @@ vows.describe('Netmask contains IP')
         'block 192.168.0.0/24':
             topic: -> new Netmask('192.168.0.0/24')
             'does not contain block 192.168': (block) -> assert.ok not block.contains('192.168')
+        'block 31.0.0.0/8':
+            topic: -> new Netmask('31.0.0.0/8')
+            'contains IP 31.5.5.5': (block) -> assert.ok block.contains('31.5.5.5')
+            'does not contain IP 031.5.5.5 (25.5.5.5)': (block) -> assert.ok not block.contains('031.5.5.5')
+        'block 127.0.0.0/8':
+            topic: -> new Netmask('127.0.0.0/8')
+            'contains IP 127.0.0.2': (block) -> assert.ok block.contains('127.0.0.2')
+            'contains IP 0177.0.0.2 (127.0.0.2)': (block) -> assert.ok block.contains('0177.0.0.2')
     .export(module)
 
 vows.describe('Netmask forEach')