mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-21 20:38:45 +00:00
Code Issues Releases Activity

Fix broken code that people tries to commit again and again despite the

Browse Source 
fact that I am this port maintainer and still alive.
This commit is contained in:
Andrey A. Chernov 1998-06-28 17:50:22 +00:00
parent ec0b378da3
commit a255968eaa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=11586
2 changed files with 61 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
mail/popper/files/patch-ag
View File

@ -16,54 +16,4 @@
((int *)ap)[3],((int *)ap)[4],((int *)ap)[5]);
# endif
va_end(ap);
--- pop_msg.c.orig Wed Nov 19 13:20:38 1997
+++ pop_msg.c Sun Jun 28 01:35:05 1998
@@ -27,6 +27,7 @@
{
POP * p;
int stat; /* POP status indicator */
+ int l, len; /* remaining buffer length */
char * format; /* Format string for the message */
va_list ap;
register char * mp;
@@ -50,6 +51,7 @@
/* Point to the message buffer */
mp = message;
+ len = sizeof(message);
/* Format the POP status code at the beginning of the message */
if (stat == POP_SUCCESS)
@@ -58,17 +60,18 @@
(void)sprintf (mp,"%s ",POP_ERR);
/* Point past the POP status indicator in the message message */
- mp += strlen(mp);
+ l = strlen(mp);
+ len -= l, mp += l;
/* Append the message (formatted, if necessary) */
if (format)
#ifdef HAVE_VPRINTF
- vsprintf(mp,format,ap);
+ vsnprintf(mp,len,format,ap);
#else
# ifdef PYRAMID
- (void)sprintf(mp,format, arg1, arg2, arg3, arg4, arg5, arg6);
+ (void)snprintf(mp,len,format, arg1, arg2, arg3, arg4, arg5, arg6);
# else
- (void)sprintf(mp,format,((int *)ap)[0],((int *)ap)[1],((int *)ap)[2],
+ (void)snprintf(mp,len,format,((int *)ap)[0],((int *)ap)[1],((int *)ap)[2],
((int *)ap)[3],((int *)ap)[4]);
# endif
#endif
@@ -87,7 +90,8 @@
(p->user ? p->user : "(null)"), p->client, message);
/* Append the <CR><LF> */
- (void)strcat(message, "\r\n");
+ len -= strlen(message);
+ (void)strncat(message, "\r\n", len);
/* Send the message to the client */
(void)fputs(message,p->output);

60
mail/popper/files/patch-ah Normal file
View File

@ -0,0 +1,60 @@
*** pop_msg.c.orig Thu Nov 20 00:20:38 1997
--- pop_msg.c Sun Jun 28 21:39:56 1998
***************
*** 27,32 ****
--- 27,33 ----
{
POP * p;
int stat; /* POP status indicator */
+ int l, len; /* remaining buffer length */
char * format; /* Format string for the message */
va_list ap;
register char * mp;
***************
*** 50,55 ****
--- 51,57 ----
/* Point to the message buffer */
mp = message;
+ len = sizeof(message);
/* Format the POP status code at the beginning of the message */
if (stat == POP_SUCCESS)
***************
*** 58,74 ****
(void)sprintf (mp,"%s ",POP_ERR);
/* Point past the POP status indicator in the message message */
! mp += strlen(mp);
/* Append the message (formatted, if necessary) */
if (format)
#ifdef HAVE_VPRINTF
! vsprintf(mp,format,ap);
#else
# ifdef PYRAMID
! (void)sprintf(mp,format, arg1, arg2, arg3, arg4, arg5, arg6);
# else
! (void)sprintf(mp,format,((int *)ap)[0],((int *)ap)[1],((int *)ap)[2],
((int *)ap)[3],((int *)ap)[4]);
# endif
#endif
--- 60,77 ----
(void)sprintf (mp,"%s ",POP_ERR);
/* Point past the POP status indicator in the message message */
! l = strlen(mp);
! len -= l, mp += l;
/* Append the message (formatted, if necessary) */
if (format)
#ifdef HAVE_VPRINTF
! vsnprintf(mp,len-3,format,ap);
#else
# ifdef PYRAMID
! (void)snprintf(mp,len-3,format, arg1, arg2, arg3, arg4, arg5, arg6);
# else
! (void)snprintf(mp,len-3,format,((int *)ap)[0],((int *)ap)[1],((int *)ap)[2],
((int *)ap)[3],((int *)ap)[4]);
# endif
#endif