svnno****@sourc*****
svnno****@sourc*****
Fri Mar 7 03:12:31 JST 2008
Revision: 3446
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3446
Author: pal_gene
Date: 2008-03-07 03:12:30 +0900 (Fri, 07 Mar 2008)
Log Message:
-----------
Reject any unknown encoding.
Modified Paths:
--------------
kazehakase/trunk/module/search/kz-hyper-estraier-search.c
Modified: kazehakase/trunk/module/search/kz-hyper-estraier-search.c
===================================================================
--- kazehakase/trunk/module/search/kz-hyper-estraier-search.c 2008-03-06 18:12:27 UTC (rev 3445)
+++ kazehakase/trunk/module/search/kz-hyper-estraier-search.c 2008-03-06 18:12:30 UTC (rev 3446)
@@ -758,19 +758,29 @@
"UTF-8", encoding,
NULL, NULL,
NULL);
+ g_free(contents);
if (utf8_contents)
{
- g_free(contents);
contents = utf8_contents;
}
else
{
g_warning("failed convert encoding. [enc:file] [%s:%s]\n",
encoding, new_path);
+ g_free(encoding);
+ g_free(new_path);
+ continue;
}
}
g_free(encoding);
}
+ else
+ {
+ g_warning("unknown encoding. [%s]\n", new_path);
+ g_free(contents);
+ g_free(new_path);
+ continue;
+ }
g_stat(new_path, &st);
mtime = st.st_mtime;
title = get_document_title(contents);