Merge pull request #16 from jerome-laforge/master

Set slice's max for option's data.

iaaddr_test.go

@@ -183,5 +183,14 @@ func TestIAAddrUnmarshalBinary(t *testing.T) {
 			t.Fatalf("[%02d] test %q, unexpected IAAddr bytes for parseIAAddr:\n- want: %v\n-  got: %v",
 				i, tt.desc, want, got)
 		}
+
+		for _, v := range iaaddr.Options {
+			for ii := range v {
+				if want, got := len(v[ii]), cap(v[ii]); want != got {
+					t.Fatalf("[%02d] test %q, unexpected capacity option data:\n- want: %v\n-  got: %v",
+						i, tt.desc, want, got)
+				}
+			}
+		}
 	}
 }

options.go

@@ -669,6 +669,8 @@ func parseOptions(b []byte) (Options, error) {
 
 		// N bytes: option data
 		o.Data = buf.Next(length)
+		// Set slice's max for option's data
+		o.Data = o.Data[:len(o.Data):len(o.Data)]
 
 		// If option data has less bytes than indicated by length,
 		// return an error

options_test.go

@@ -2266,5 +2266,14 @@ func Test_parseOptions(t *testing.T) {
 			t.Fatalf("[%02d] test %q, unexpected Options map for parseOptions(%v):\n- want: %v\n-  got: %v",
 				i, tt.desc, tt.buf, want, got)
 		}
+
+		for k, v := range tt.options {
+			for ii := range v {
+				if want, got := cap(v[ii]), cap(options[k][ii]); want != got {
+					t.Fatalf("[%02d] test %q, unexpected capacity option data:\n- want: %v\n-  got: %v",
+						i, tt.desc, want, got)
+				}
+			}
+		}
 	}
 }