diff -Nrc php-3.0.6-kanji/functions/kanjiconv.c php-3.0.6-kanji-fix1/functions/kanjiconv.c
*** php-3.0.6-kanji/functions/kanjiconv.c	Thu Jan  7 15:17:29 1999
--- php-3.0.6-kanji-fix1/functions/kanjiconv.c	Tue Jan 12 14:45:00 1999
***************
*** 1083,1088 ****
--- 1083,1089 ----
    unsigned char *ret;
    size_t retlen;
  
+ 	*(str+n)='\0';
    ret=(unsigned char*)emalloc(2*strlen(str)+1);
  
    (*kfunction_table[KANJI_GLOBAL(output_kanji_code)][EUC])(ret,str);
***************
*** 1143,1157 ****
  {
      YYSTYPE *arg1, *arg2, *arg3;
      int m,n,i,j,len,p;
!     unsigned char *str, *ret_str;
  
      if (ARG_COUNT(ht) != 3 || getParameters(ht, 3, &arg1, &arg2, &arg3) == FAILURE) {
  	WRONG_PARAM_COUNT;
      }
  
-     if (ret_str) {
-         efree(ret_str);
-     }
      convert_to_string(arg1);
      convert_to_long(arg2);
      convert_to_long(arg3);
--- 1144,1155 ----
  {
      YYSTYPE *arg1, *arg2, *arg3;
      int m,n,i,j,len,p;
!     unsigned char *str;
  
      if (ARG_COUNT(ht) != 3 || getParameters(ht, 3, &arg1, &arg2, &arg3) == FAILURE) {
  	WRONG_PARAM_COUNT;
      }
  
      convert_to_string(arg1);
      convert_to_long(arg2);
      convert_to_long(arg3);
***************
*** 1168,1174 ****
  	return_value->type = IS_STRING;
  	return;
      }
-     
      if(m+n > len) {
  	for(i=0,p=0;i<strlen(str);i++) {
  	    if(p==m) break; 
--- 1166,1171 ----
***************
*** 1184,1189 ****
--- 1181,1189 ----
  	    p++;
  	}
  	
+ 	if (ret_str) {
+ 	    efree(ret_str);
+ 	}
  	ret_str = (unsigned char *)emalloc(i-j+1);
  	strncpy(ret_str,&str[j],i-j);
  	ret_str[i-j]='\0';
diff -Nrc php-3.0.6-kanji/functions/post.c php-3.0.6-kanji-fix1/functions/post.c
*** php-3.0.6-kanji/functions/post.c	Tue Jan  5 15:15:02 1999
--- php-3.0.6-kanji-fix1/functions/post.c	Tue Jan 12 13:26:39 1999
***************
*** 360,366 ****
  			/* FIXME: XXX: not binary safe, discards returned length */
  			_php3_urldecode(var, strlen(var));
  			_php3_urldecode(val, strlen(val));
! 			(void)conv2euc(val);
  			_php3_parse_gpc_data(val,var,array_ptr);
  		}
  		if (arg == PARSE_COOKIE) {
--- 360,366 ----
  			/* FIXME: XXX: not binary safe, discards returned length */
  			_php3_urldecode(var, strlen(var));
  			_php3_urldecode(val, strlen(val));
! 			(void)conv2euc(val, strlen(val));
  			_php3_parse_gpc_data(val,var,array_ptr);
  		}
  		if (arg == PARSE_COOKIE) {