Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
libloc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
libloc
Commits
98b2876e
Commit
98b2876e
authored
Aug 16, 2022
by
Michael Tremer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check return value of fread() when reading header
Signed-off-by:
Michael Tremer
<
michael.tremer@ipfire.org
>
parent
2c004816
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
4 deletions
+17
-4
src/database.c
src/database.c
+8
-2
src/writer.c
src/writer.c
+9
-2
No files found.
src/database.c
View file @
98b2876e
...
...
@@ -486,6 +486,8 @@ LOC_EXPORT struct loc_database* loc_database_unref(struct loc_database* db) {
}
LOC_EXPORT
int
loc_database_verify
(
struct
loc_database
*
db
,
FILE
*
f
)
{
size_t
bytes_read
=
0
;
// Cannot do this when no signature is available
if
(
!
db
->
signature1
&&
!
db
->
signature2
)
{
DEBUG
(
db
->
ctx
,
"No signature available to verify
\n
"
);
...
...
@@ -523,7 +525,12 @@ LOC_EXPORT int loc_database_verify(struct loc_database* db, FILE* f) {
// Read magic
struct
loc_database_magic
magic
;
fread
(
&
magic
,
1
,
sizeof
(
magic
),
db
->
f
);
bytes_read
=
fread
(
&
magic
,
1
,
sizeof
(
magic
),
db
->
f
);
if
(
bytes_read
<
sizeof
(
magic
))
{
ERROR
(
db
->
ctx
,
"Could not read header: %m
\n
"
);
r
=
1
;
goto
CLEANUP
;
}
hexdump
(
db
->
ctx
,
&
magic
,
sizeof
(
magic
));
...
...
@@ -538,7 +545,6 @@ LOC_EXPORT int loc_database_verify(struct loc_database* db, FILE* f) {
// Read the header
struct
loc_database_header_v1
header_v1
;
size_t
bytes_read
;
switch
(
db
->
version
)
{
case
LOC_DATABASE_VERSION_1
:
...
...
src/writer.c
View file @
98b2876e
...
...
@@ -537,6 +537,8 @@ static int loc_database_write_countries(struct loc_writer* writer,
static
int
loc_writer_create_signature
(
struct
loc_writer
*
writer
,
struct
loc_database_header_v1
*
header
,
FILE
*
f
,
EVP_PKEY
*
private_key
,
char
*
signature
,
size_t
*
length
)
{
size_t
bytes_read
=
0
;
DEBUG
(
writer
->
ctx
,
"Creating signature...
\n
"
);
// Read file from the beginning
...
...
@@ -554,7 +556,12 @@ static int loc_writer_create_signature(struct loc_writer* writer,
// Read magic
struct
loc_database_magic
magic
;
fread
(
&
magic
,
1
,
sizeof
(
magic
),
f
);
bytes_read
=
fread
(
&
magic
,
1
,
sizeof
(
magic
),
f
);
if
(
bytes_read
<
sizeof
(
magic
))
{
ERROR
(
writer
->
ctx
,
"Could not read header: %m
\n
"
);
r
=
1
;
goto
END
;
}
hexdump
(
writer
->
ctx
,
&
magic
,
sizeof
(
magic
));
...
...
@@ -580,7 +587,7 @@ static int loc_writer_create_signature(struct loc_writer* writer,
// Walk through the file in chunks of 64kB
char
buffer
[
64
*
1024
];
while
(
!
feof
(
f
))
{
size_t
bytes_read
=
fread
(
buffer
,
1
,
sizeof
(
buffer
),
f
);
bytes_read
=
fread
(
buffer
,
1
,
sizeof
(
buffer
),
f
);
if
(
ferror
(
f
))
{
ERROR
(
writer
->
ctx
,
"Error reading from file: %m
\n
"
);
...
...
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