Skip to content

server: pass the escaped buffer, not escape_json()'s length, to %s #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wberube merged 1 commit into from
Sep 24, 2026
Merged

server: pass the escaped buffer, not escape_json()'s length, to %s #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,6 +1227,8 @@ void respond_request(http_request_t *req) {
}
char esc_user[sizeof(app_config.rtsp_auth_user) * 6 + 1];
char esc_codec[sizeof(app_config.rtsp_audio_codec) * 6 + 1];
escape_json(esc_user, app_config.rtsp_auth_user, sizeof(esc_user));
escape_json(esc_codec, app_config.rtsp_audio_codec, sizeof(esc_codec));
respLen = sprintf(response,
"HTTP/1.1 200 OK\r\n"
"Content-Type: application/json;charset=UTF-8\r\n"
Expand All @@ -1235,9 +1237,7 @@ void respond_request(http_request_t *req) {
"{\"enable\":%s,\"enable_auth\":%s,\"port\":%d,\"auth_user\":\"%s\",\"audio_codec\":\"%s\","
"\"note\":\"port and codec changes apply after restart\"}",
app_config.rtsp_enable ? "true" : "false", app_config.rtsp_enable_auth ? "true" : "false",
app_config.rtsp_port,
escape_json(esc_user, app_config.rtsp_auth_user, sizeof(esc_user)),
escape_json(esc_codec, app_config.rtsp_audio_codec, sizeof(esc_codec)));
app_config.rtsp_port, esc_user, esc_codec);
send_and_close(req->clntFd, response, respLen);
return;
}
Expand All @@ -1260,14 +1260,15 @@ void respond_request(http_request_t *req) {
}
}
char esc_onvif_user[sizeof(app_config.onvif_auth_user) * 6 + 1];
escape_json(esc_onvif_user, app_config.onvif_auth_user, sizeof(esc_onvif_user));
respLen = sprintf(response,
"HTTP/1.1 200 OK\r\n"
"Content-Type: application/json;charset=UTF-8\r\n"
"Connection: close\r\n"
"\r\n"
"{\"enable\":%s,\"enable_auth\":%s,\"auth_user\":\"%s\",\"note\":\"applies after restart\"}",
app_config.onvif_enable ? "true" : "false", app_config.onvif_enable_auth ? "true" : "false",
escape_json(esc_onvif_user, app_config.onvif_auth_user, sizeof(esc_onvif_user)));
esc_onvif_user);
send_and_close(req->clntFd, response, respLen);
return;
}
Expand Down