Hello community, here is the log from the commit of package ckermit checked in at Thu Dec 14 13:58:24 CET 2006. -------- --- ckermit/ckermit.changes 2006-11-30 12:11:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/ckermit/ckermit.changes 2006-12-14 11:15:08.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Dec 14 10:58:36 CET 2006 - prusnak@suse.cz + +- fixed 3rd argument in strncat functions + +------------------------------------------------------------------- New: ---- cku211-strncat.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ckermit.spec ++++++ --- /var/tmp/diff_new_pack.5eiPIc/_old 2006-12-14 13:56:56.000000000 +0100 +++ /var/tmp/diff_new_pack.5eiPIc/_new 2006-12-14 13:56:56.000000000 +0100 @@ -19,7 +19,7 @@ Provides: kermit Autoreqprov: on Version: 8.0.211 -Release: 39 +Release: 41 URL: http://www.columbia.edu/kermit/ Source: %{archiv_name}.tar.bz2 Patch0: %{archiv_name}-fmt.diff @@ -30,6 +30,7 @@ Patch5: %{archiv_name}-debug.diff Patch6: %{archiv_name}-uninitialized.diff Patch7: %{archiv_name}-string_comparison.diff +Patch8: %{archiv_name}-strncat.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -50,6 +51,7 @@ #%patch5 %patch6 %patch7 +%patch8 %build make linux+openssl+shadow KFLAGS="$RPM_OPT_FLAGS" \ @@ -73,6 +75,8 @@ /usr/bin/* %changelog -n ckermit +* Thu Dec 14 2006 - prusnak@suse.cz +- fixed 3rd argument in strncat functions * Thu Nov 30 2006 - prusnak@suse.cz - fixed comparison with string literal (string_comparison.diff) [#224842] * Mon Feb 27 2006 - anicka@suse.cz ++++++ cku211-strncat.diff ++++++ --- ckcfns.c +++ ckcfns.c @@ -5557,7 +5557,7 @@ fromgetpath = 0; if (server && !isabsolute(filnam) && (ngetpath > i)) { ckstrncpy(fullname,getpath[i],CKMAXPATH+1); - strncat(fullname,filnam,CKMAXPATH); + strncat(fullname,filnam,CKMAXPATH-strlen(fullname)-1); debug(F111,"gnfile getpath",fullname,i); fromgetpath = 1; i++; --- ckcftp.c +++ ckcftp.c @@ -1899,8 +1899,8 @@ if (t2 > -1L) { ftplogprev = t2; p = hhmmss(t2); - strncat(ftplogbuf,"E=",CXLOGBUFL); /* Append to log record */ - strncat(ftplogbuf,p,CXLOGBUFL); + strncat(ftplogbuf,"E=",CXLOGBUFL-strlen(ftplogbuf)-1); /* Append to log record */ + strncat(ftplogbuf,p,CXLOGBUFL-strlen(ftplogbuf)-1); } else ftplogprev = 0L; debug(F101,"ftp cx log dialog","",dialog); --- ckuus3.c +++ ckuus3.c @@ -4653,8 +4653,8 @@ cx_prev = t2; p = hhmmss(t2); debug(F110,"dologend hhmmss",p,0); - strncat(cxlogbuf,"E=",CXLOGBUFL); /* Append to log record */ - strncat(cxlogbuf,p,CXLOGBUFL); + strncat(cxlogbuf,"E=",CXLOGBUFL-strlen(cxlogbuf)-1); /* Append to log record */ + strncat(cxlogbuf,p,CXLOGBUFL-strlen(cxlogbuf)-1); debug(F110,"dologend cxlogbuf 2",cxlogbuf,0); } else cx_prev = 0L; --- ckuus4.c +++ ckuus4.c @@ -8147,8 +8147,8 @@ char *p = bp[0]; /* Reuse this space */ *p = NUL; /* Make into dodo() arg list */ for (i = 1; i < argn; i++) { - strncat(p,bp[i],MAXARGLEN); - strncat(p," ",MAXARGLEN); + strncat(p,bp[i],MAXARGLEN-strlen(p)-1); + strncat(p," ",MAXARGLEN-strlen(p)-1); } s = bp[0]; /* Point to new list */ } --- ckuus7.c +++ ckuus7.c @@ -10449,8 +10449,8 @@ if ((x = cmtxt("Rest of command","",&s,xxstring)) < 0) return(x); if (*s) { - strncat(line," ",LINBUFSIZ); - strncat(line,s,LINBUFSIZ); + strncat(line," ",LINBUFSIZ-strlen(line)-1); + strncat(line,s,LINBUFSIZ-strlen(line)-1); } s = line; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de