From: konn Date: Sat, 1 Jul 2006 05:55:17 +0000 (+0000) Subject: * change writting. X-Git-Tag: v0.14.1~771 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=819dba75ab5c34d0a24f78a98e064266d26c6651;p=modchxj%2Fmod_chxj.git * change writting. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1348 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- diff --git a/src/chxj_chtml10.c b/src/chxj_chtml10.c index 13e1ecd8..3c367c61 100644 --- a/src/chxj_chtml10.c +++ b/src/chxj_chtml10.c @@ -313,7 +313,7 @@ chxj_exchange_chtml10( request_rec* r, device_table* spec, const char* src, - apr_size_t srclen, + apr_size_t srclen, apr_size_t* dstlen, chxjconvrule_entry* entryp, const char* cookie_id diff --git a/src/mod_chxj.c b/src/mod_chxj.c index 95b6ad76..c8fe0fae 100644 --- a/src/mod_chxj.c +++ b/src/mod_chxj.c @@ -614,17 +614,22 @@ chxj_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) && *(char*)r->content_type == 'i' && strncmp(r->content_type, "image/", 6) == 0) { if (ctx->len) { - char* tmp = apr_palloc(r->pool, ctx->len + 1); + char* tmp; + + tmp = apr_palloc(r->pool, ctx->len + 1); + memset(tmp, 0, ctx->len + 1); memcpy(tmp, ctx->buffer, ctx->len); DBG1(r, "input data=[%s]", tmp); ctx->buffer = - chxj_exchange_image(r, (const char**)&tmp,(apr_size_t*)&ctx->len); - if (ctx->buffer == NULL) { + chxj_exchange_image(r, + (const char**)&tmp, + (apr_size_t*)&ctx->len); + + if (ctx->buffer == NULL) ctx->buffer = tmp; - } DBG2(r, "output data=[%.*s]", ctx->len,ctx->buffer); }