1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
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
|
