[naviserver-commits] naviserver/nsd tclmisc.c,1.15,1.16

[Zoran V. <vas...@us...>]

Update of /cvsroot/naviserver/naviserver/nsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19785/nsd

Modified Files:
	tclmisc.c 
Log Message:
Fixes Bug #1405988.


Index: tclmisc.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclmisc.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tclmisc.c	22 Oct 2005 09:32:14 -0000	1.15
--- tclmisc.c	14 Jan 2006 17:45:41 -0000	1.16
***************
*** 446,450 ****
  NsTclHTUUEncodeObjCmd(ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj **objv)
  {
!     char *string;
      char *result;
      int   nbytes;
--- 446,450 ----
  NsTclHTUUEncodeObjCmd(ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj **objv)
  {
!     unsigned char *string;
      char *result;
      int   nbytes;
***************
*** 454,460 ****
          return TCL_ERROR;
      }
!     string = Tcl_GetStringFromObj(objv[1], &nbytes);
      result = ns_malloc((size_t) 1 + (4 * MAX(nbytes,2)) / 2);
!     Ns_HtuuEncode((unsigned char *) string, (size_t)nbytes, result);
      Tcl_SetResult(interp, result, (Tcl_FreeProc *) ns_free);
      return TCL_OK;
--- 454,460 ----
          return TCL_ERROR;
      }
!     string = Tcl_GetByteArrayFromObj(objv[1], &nbytes);
      result = ns_malloc((size_t) 1 + (4 * MAX(nbytes,2)) / 2);
!     Ns_HtuuEncode(string, (size_t)nbytes, result);
      Tcl_SetResult(interp, result, (Tcl_FreeProc *) ns_free);
      return TCL_OK;