From 238ffa8e63c5766f523b2517e993479f83671160 Mon Sep 17 00:00:00 2001 From: Marcin Slusarz Date: Mon, 4 Feb 2008 22:27:39 +0100 Subject: [PATCH] --- yaml --- r: 91811 b: refs/heads/master c: 6305a0a9d559e97807b8bc6d5250fd525dc571a7 h: refs/heads/master i: 91809: a1534acdb485f36aff684ac294b3a0423410aace 91807: 388594e9a15283dadcf907c8494a2860fcc887cb v: v3 --- [refs] | 2 +- trunk/fs/udf/unicode.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c12eeef3180c..3a24917ab97a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79cfe0ff5fb585b92126365a2881262945ac0ee9 +refs/heads/master: 6305a0a9d559e97807b8bc6d5250fd525dc571a7 diff --git a/trunk/fs/udf/unicode.c b/trunk/fs/udf/unicode.c index 05bc505ec01a..24d6165d21a9 100644 --- a/trunk/fs/udf/unicode.c +++ b/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; }