null+****@clear*****
null+****@clear*****
2011年 12月 9日 (金) 18:44:42 JST
Daijiro MORI 2011-12-09 09:44:42 +0000 (Fri, 09 Dec 2011)
New Revision: 1f4b99af6c8c3d8e85e4eba2a3d1e84caaad29ff
Log:
stopped adding nul character in grn_itoh(). refs #1194
Modified files:
lib/db.c
lib/io.c
lib/str.c
Modified: lib/db.c (+1 -0)
===================================================================
--- lib/db.c 2011-12-09 05:50:56 +0000 (f581e70)
+++ lib/db.c 2011-12-09 09:44:42 +0000 (615b018)
@@ -78,6 +78,7 @@ gen_pathname(const char *path, char *buffer, int fno)
if (fno >= 0) {
buffer[len] = '.';
grn_itoh(fno, buffer + len + 1, 7);
+ buffer[len + 8] = '\0';
} else {
buffer[len] = '\0';
}
Modified: lib/io.c (+1 -0)
===================================================================
--- lib/io.c 2011-12-09 05:50:56 +0000 (caa4028)
+++ lib/io.c 2011-12-09 09:44:42 +0000 (a4dc887)
@@ -555,6 +555,7 @@ gen_pathname(const char *path, char *buffer, int fno)
if (fno) {
buffer[len] = '.';
grn_itoh(fno, buffer + len + 1, 3);
+ buffer[len + 4] = '\0';
} else {
buffer[len] = '\0';
}
Modified: lib/str.c (+0 -1)
===================================================================
--- lib/str.c 2011-12-09 05:50:56 +0000 (9016292)
+++ lib/str.c 2011-12-09 09:44:42 +0000 (639bf4f)
@@ -1528,7 +1528,6 @@ grn_itoh(unsigned int i, char *p, unsigned int len)
{
static const char *hex = "0123456789ABCDEF";
p += len;
- *p-- = '\0';
while (len--) {
*p-- = hex[i & 0xf];
i >>= 4;