Merge branch 'master' of https://github.com/blikjeham/portall

Conflicts: tlv.c
blikjeham · Jun 14, 2014 · 9d0def6 · 9d0def6
2 parents c57df4c + eb43aaf
commit 9d0def6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/tlv.c b/tlv.c
@@ -265,8 +265,9 @@ void buffer_to_tlv(pbuffer *buffer, struct tlv *tlv)
 {
 	extract_torv(buffer, &tlv->type);
 	extract_torv(buffer, &tlv->length);
-	tlv->value = buffer;
-	DB("t: %d, l: %d", tlv->type, tlv->length);
+
+	pbuffer_copy(tlv->value, buffer, tlv->length);
+
 	pbuffer_consume(buffer);
 }