oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Fix overaggressive checks, fix comments.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22560 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-02-03 17:35:06 +00:00
parent a500df0977
commit 74782cc769
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/wind/utf8.c
View File

@@ -148,10 +148,12 @@ static const char first_char[4] =
* *
* @param in an UCS4 string to convert. * @param in an UCS4 string to convert.
* @param in_len the length input array. * @param in_len the length input array.
* @param out the resulting UTF-8 strint, must be at least * @param out the resulting UTF-8 strint, must be at least
* wind_ucs4utf8_length() long. If out is NULL, the function will * wind_ucs4utf8_length() + 1 long (the extra char for the NUL). If
* calculate the needed space for the out variable (just like * out is NULL, the function will calculate the needed space for the
* wind_ucs4utf8_length()). * out variable (just like wind_ucs4utf8_length()).
* @param out_len before processing out_len should be the length of * @param out_len before processing out_len should be the length of
* the out variable, after processing it will be the length of the out * the out variable, after processing it will be the length of the out
* string. * string.
@@ -410,11 +412,11 @@ wind_ucs2utf8(const uint16_t *in, size_t in_len, char *out, size_t *out_len)
case 1: case 1:
out[0] = ch | first_char[len - 1]; out[0] = ch | first_char[len - 1];
} }
}
out += len; out += len;
} }
}
if (out) { if (out) {
if (o + 1 >= *out_len) if (o >= *out_len)
return WIND_ERR_OVERRUN; return WIND_ERR_OVERRUN;
*out = '\0'; *out = '\0';
} }