Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Main
Synchronet
Commits
3503816f
Commit
3503816f
authored
Mar 13, 2022
by
Rob Swindell
💬
Browse files
Replace sprintf() calls with safe_snprintf()
parent
e01c7f89
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
src/smblib/smbtxt.c
src/smblib/smbtxt.c
+8
-8
No files found.
src/smblib/smbtxt.c
View file @
3503816f
...
@@ -41,7 +41,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, ulong mode)
...
@@ -41,7 +41,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, ulong mode)
long
l
=
0
,
lzhlen
,
length
;
long
l
=
0
,
lzhlen
,
length
;
if
((
buf
=
(
char
*
)
malloc
(
sizeof
(
char
)))
==
NULL
)
{
if
((
buf
=
(
char
*
)
malloc
(
sizeof
(
char
)))
==
NULL
)
{
sprintf
(
smb
->
last_error
s
afe_sn
printf
(
smb
->
last_error
,
sizeof
(
smb
->
last_error
)
,
"%s malloc failure of %"
XP_PRIsize_t
"u bytes for buffer"
,
"%s malloc failure of %"
XP_PRIsize_t
"u bytes for buffer"
,
__FUNCTION__
,
sizeof
(
char
));
,
__FUNCTION__
,
sizeof
(
char
));
return
(
NULL
);
return
(
NULL
);
...
@@ -55,7 +55,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, ulong mode)
...
@@ -55,7 +55,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, ulong mode)
str
=
(
char
*
)
msg
->
hfield_dat
[
i
];
str
=
(
char
*
)
msg
->
hfield_dat
[
i
];
length
=
strlen
(
str
)
+
2
;
/* +2 for crlf */
length
=
strlen
(
str
)
+
2
;
/* +2 for crlf */
if
((
p
=
(
char
*
)
realloc
(
buf
,
l
+
length
+
1
))
==
NULL
)
{
if
((
p
=
(
char
*
)
realloc
(
buf
,
l
+
length
+
1
))
==
NULL
)
{
sprintf
(
smb
->
last_error
s
afe_sn
printf
(
smb
->
last_error
,
sizeof
(
smb
->
last_error
)
,
"%s realloc failure of %ld bytes for comment buffer"
,
"%s realloc failure of %ld bytes for comment buffer"
,
__FUNCTION__
,
l
+
length
+
1
);
,
__FUNCTION__
,
l
+
length
+
1
);
free
(
buf
);
free
(
buf
);
...
@@ -66,7 +66,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, ulong mode)
...
@@ -66,7 +66,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, ulong mode)
}
}
if
(
l
)
{
/* Add a blank line after comments */
if
(
l
)
{
/* Add a blank line after comments */
if
((
p
=
(
char
*
)
realloc
(
buf
,
l
+
3
))
==
NULL
)
{
if
((
p
=
(
char
*
)
realloc
(
buf
,
l
+
3
))
==
NULL
)
{
sprintf
(
smb
->
last_error
s
afe_sn
printf
(
smb
->
last_error
,
sizeof
(
smb
->
last_error
)
,
"%s realloc failure of %ld bytes for comment buffer"
,
"%s realloc failure of %ld bytes for comment buffer"
,
__FUNCTION__
,
l
+
3
);
,
__FUNCTION__
,
l
+
3
);
free
(
buf
);
free
(
buf
);
...
@@ -82,7 +82,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, ulong mode)
...
@@ -82,7 +82,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, ulong mode)
char
tmp
[
128
];
char
tmp
[
128
];
length
=
safe_snprintf
(
tmp
,
sizeof
(
tmp
),
"%2u: %s
\r\n
"
,
++
answers
,
(
char
*
)
msg
->
hfield_dat
[
i
]);
length
=
safe_snprintf
(
tmp
,
sizeof
(
tmp
),
"%2u: %s
\r\n
"
,
++
answers
,
(
char
*
)
msg
->
hfield_dat
[
i
]);
if
((
p
=
(
char
*
)
realloc
(
buf
,
l
+
length
+
1
))
==
NULL
)
{
if
((
p
=
(
char
*
)
realloc
(
buf
,
l
+
length
+
1
))
==
NULL
)
{
sprintf
(
smb
->
last_error
s
afe_sn
printf
(
smb
->
last_error
,
sizeof
(
smb
->
last_error
)
,
"%s realloc failure of %ld bytes for comment buffer"
,
"%s realloc failure of %ld bytes for comment buffer"
,
__FUNCTION__
,
l
+
length
+
1
);
,
__FUNCTION__
,
l
+
length
+
1
);
free
(
buf
);
free
(
buf
);
...
@@ -130,7 +130,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, ulong mode)
...
@@ -130,7 +130,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, ulong mode)
if
(
length
<
1
)
if
(
length
<
1
)
continue
;
continue
;
if
((
lzhbuf
=
(
char
*
)
malloc
(
length
))
==
NULL
)
{
if
((
lzhbuf
=
(
char
*
)
malloc
(
length
))
==
NULL
)
{
sprintf
(
smb
->
last_error
s
afe_sn
printf
(
smb
->
last_error
,
sizeof
(
smb
->
last_error
)
,
"%s malloc failure of %ld bytes for LZH buffer"
,
"%s malloc failure of %ld bytes for LZH buffer"
,
__FUNCTION__
,
length
);
,
__FUNCTION__
,
length
);
free
(
buf
);
free
(
buf
);
...
@@ -138,7 +138,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, ulong mode)
...
@@ -138,7 +138,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, ulong mode)
return
(
NULL
);
return
(
NULL
);
}
}
if
(
smb_fread
(
smb
,
lzhbuf
,
length
,
smb
->
sdt_fp
)
!=
length
)
{
if
(
smb_fread
(
smb
,
lzhbuf
,
length
,
smb
->
sdt_fp
)
!=
length
)
{
sprintf
(
smb
->
last_error
s
afe_sn
printf
(
smb
->
last_error
,
sizeof
(
smb
->
last_error
)
,
"%s read failure of %ld bytes for LZH data"
,
"%s read failure of %ld bytes for LZH data"
,
__FUNCTION__
,
length
);
,
__FUNCTION__
,
length
);
free
(
lzhbuf
);
free
(
lzhbuf
);
...
@@ -148,7 +148,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, ulong mode)
...
@@ -148,7 +148,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, ulong mode)
}
}
lzhlen
=*
(
int32_t
*
)
lzhbuf
;
lzhlen
=*
(
int32_t
*
)
lzhbuf
;
if
((
p
=
(
char
*
)
realloc
(
buf
,
l
+
lzhlen
+
3L
))
==
NULL
)
{
if
((
p
=
(
char
*
)
realloc
(
buf
,
l
+
lzhlen
+
3L
))
==
NULL
)
{
sprintf
(
smb
->
last_error
s
afe_sn
printf
(
smb
->
last_error
,
sizeof
(
smb
->
last_error
)
,
"%s realloc failure of %ld bytes for text buffer"
,
"%s realloc failure of %ld bytes for text buffer"
,
__FUNCTION__
,
l
+
lzhlen
+
3L
);
,
__FUNCTION__
,
l
+
lzhlen
+
3L
);
free
(
lzhbuf
);
free
(
lzhbuf
);
...
@@ -163,7 +163,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, ulong mode)
...
@@ -163,7 +163,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, ulong mode)
}
}
else
{
else
{
if
((
p
=
(
char
*
)
realloc
(
buf
,
l
+
length
+
3L
))
==
NULL
)
{
if
((
p
=
(
char
*
)
realloc
(
buf
,
l
+
length
+
3L
))
==
NULL
)
{
sprintf
(
smb
->
last_error
s
afe_sn
printf
(
smb
->
last_error
,
sizeof
(
smb
->
last_error
)
,
"%s realloc failure of %ld bytes for text buffer"
,
"%s realloc failure of %ld bytes for text buffer"
,
__FUNCTION__
,
l
+
length
+
3L
);
,
__FUNCTION__
,
l
+
length
+
3L
);
free
(
buf
);
free
(
buf
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment