c/civetweb
1
0
Fork 0
mirror of https://github.com/civetweb/civetweb synced 2025-03-28 21:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code analysis: Update to new coverity version

Browse Source
This commit is contained in:
bel2125 2022-02-17 19:52:50 +01:00
parent 64e346e6b6
commit 8a45e81995
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/coverity_check.sh
View File

@ -26,6 +26,7 @@ cp src/md5.inl cov_build/src/
cp src/sha1.inl cov_build/src/
cp src/response.inl cov_build/src/
cp src/timer.inl cov_build/src/
cp src/http2.inl cov_build/src/
cp src/handle_form.inl cov_build/src/
cp src/openssl_dl.inl cov_build/src/
cp include/civetweb.h cov_build/include/
@ -34,7 +35,7 @@ cp resources/Makefile.in-os cov_build/resources/
cd cov_build
# new scan build
~/cov-analysis-linux64-2019.03/bin/cov-build --dir cov-int make WITH_IPV6=1 WITH_WEBSOCKET=1 WITH_SERVER_STATS=1 WITH_EXPERIMENTAL=1
~/cov-analysis-linux64-2021.12.1/bin/cov-build --dir cov-int make WITH_IPV6=1 WITH_WEBSOCKET=1 WITH_SERVER_STATS=1 WITH_HTTP2=1 WITH_EXPERIMENTAL=1
# pack build results for upload

24
src/civetweb.c
View File

@ -3664,6 +3664,7 @@ mg_construct_local_link(const struct mg_connection *conn,
server_name,
ri->local_uri);
default_port = 0;
mg_free(uri_encoded);
return 0;
}
#endif
@ -3728,6 +3729,7 @@ mg_construct_local_link(const struct mg_connection *conn,
portstr,
uri_encoded);
mg_free(uri_encoded);
if (truncated) {
return -1;
}
@ -11957,7 +11959,14 @@ dav_move_file(struct mg_connection *conn, const char *path, int do_copy)
/* File exists */
if (do_overwrite) {
/* Overwrite allowed: delete the file first */
remove(dest_path);
if (0 != remove(dest_path)) {
/* No overwrite: return error */
mg_send_http_error(conn,
403,
"Cannot overwrite file: %s",
dest_path);
return;
}
} else {
/* No overwrite: return error */
mg_send_http_error(conn,
@ -12143,7 +12152,13 @@ put_file(struct mg_connection *conn, const char *path)
r1 = r2 = 0;
if ((range != NULL) && parse_range_header(range, &r1, &r2) > 0) {
conn->status_code = 206; /* Partial content */
fseeko(file.access.fp, r1, SEEK_SET);
if (0 != fseeko(file.access.fp, r1, SEEK_SET)) {
mg_send_http_error(conn,
500,
"Error: Internal error processing file %s",
path);
return;
}
}
if (!forward_body_data(conn, file.access.fp, INVALID_SOCKET, NULL)) {
@ -12823,12 +12838,15 @@ dav_lock_file(struct mg_connection *conn, const char *path)
static void
dav_unlock_file(struct mg_connection *conn, const char *path)
{
/* internal function - therefore conn is assumed to be valid */
char link_buf[UTF8_PATH_MAX * 2]; /* Path + server root */
struct twebdav_lock *dav_lock = conn->phys_ctx->webdav_lock;
int lock_index;
if (!conn || !path || !conn->dom_ctx || !conn->request_info.remote_user) {
if (!path || !conn->dom_ctx || !conn->request_info.remote_user) {
return;
}
mg_get_request_link(conn, link_buf, sizeof(link_buf));
mg_lock_context(conn->phys_ctx);

6
src/http2.inl
View File

@ -838,12 +838,8 @@ static int
is_valid_http2_primer(struct mg_connection *conn)
{
size_t pri_len = http2_pri_len;
char buf[32];
char buf[32]; /* Buffer must hold 24 bytes primer */
if (pri_len > sizeof(buf)) {
/* Should never be reached - the RFC primer has 24 bytes */
return 0;
}
int read_pri_len = mg_read(conn, buf, pri_len);
if ((read_pri_len != (int)pri_len)
|| (0 != memcmp(buf, http2_pri, pri_len))) {