---

yaml
---
r: 91811
b: refs/heads/master
c: 6305a0a
h: refs/heads/master
i:
  91809: a1534ac
  91807: 388594e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79cfe0ff5fb585b92126365a2881262945ac0ee9
+refs/heads/master: 6305a0a9d559e97807b8bc6d5250fd525dc571a7

trunk/fs/udf/unicode.c

@@ -48,14 +48,16 @@ int udf_build_ustr(struct ustr *dest, dstring *ptr, int size)
 {
 	int usesize;
 
-	if ((!dest) || (!ptr) || (!size))
+	if (!dest || !ptr || !size)
 		return -1;
+	BUG_ON(size < 2);
 
-	memset(dest, 0, sizeof(struct ustr));
-	usesize = (size > UDF_NAME_LEN) ? UDF_NAME_LEN : size;
+	usesize = min_t(size_t, ptr[size - 1], sizeof(dest->u_name));
+	usesize = min(usesize, size - 2);
 	dest->u_cmpID = ptr[0];
-	dest->u_len = ptr[size - 1];
-	memcpy(dest->u_name, ptr + 1, usesize - 1);
+	dest->u_len = usesize;
+	memcpy(dest->u_name, ptr + 1, usesize);
+	memset(dest->u_name + usesize, 0, sizeof(dest->u_name) - usesize);
 
 	return 0;
 }