diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 48425385b..4994ef459 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -210,7 +210,7 @@
 		},
 		{
 			"ImportPath": "github.com/paultag/sniff/parser",
-			"Rev": "558797aed1e6daa735d8fada0b863b89d72dcfba"
+			"Rev": "87325c3dddf408cfb71f5044873d34ac426d5a59"
 		},
 		{
 			"ImportPath": "github.com/pborman/uuid",
diff --git a/vendor/github.com/paultag/sniff/LICENSE b/vendor/github.com/paultag/sniff/LICENSE
index 1e4a5f8dd..5984a479b 100644
--- a/vendor/github.com/paultag/sniff/LICENSE
+++ b/vendor/github.com/paultag/sniff/LICENSE
@@ -1,17 +1,13 @@
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
+Copyright 2017 Paul Tagliamonte
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/vendor/github.com/paultag/sniff/parser/parser.go b/vendor/github.com/paultag/sniff/parser/parser.go
index 0adbe4c08..edc75ef44 100644
--- a/vendor/github.com/paultag/sniff/parser/parser.go
+++ b/vendor/github.com/paultag/sniff/parser/parser.go
@@ -1,22 +1,16 @@
-/* {{{ Copyright (c) Paul R. Tagliamonte <paultag@debian.org>, 2015
+/* {{{ Copyright 2017 Paul Tagliamonte
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE. }}} */
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. }}} */
 
 package parser
 
@@ -82,10 +76,13 @@ func GetSNBlock(data []byte) ([]byte, error) {
 	}
 
 	extensionLength := int((data[index] << 8) + data[index+1])
+	if extensionLength+2 > len(data) {
+		return []byte{}, fmt.Errorf("Extension looks bonkers")
+	}
 	data = data[2 : extensionLength+2]
 
 	for {
-		if index+4 >= len(data) {
+		if index+3 >= len(data) {
 			break
 		}
 		length := int((data[index+2] << 8) + data[index+3])