vcc_gnd
/
esp-who
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Issue 102, missing null check in index_handler() (#103)

pull/104/head
Bond Keevil 2019-08-09 22:40:22 -04:00 committed by XiaochaoGONG
parent fec860da0e
commit 49ecd1a2b6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/single_chip/camera_web_server/main/app_httpd.c
View File

@ -648,11 +648,17 @@ static esp_err_t index_handler(httpd_req_t *req){
httpd_resp_set_type(req, "text/html"); httpd_resp_set_type(req, "text/html");
httpd_resp_set_hdr(req, "Content-Encoding", "gzip"); httpd_resp_set_hdr(req, "Content-Encoding", "gzip");
sensor_t * s = esp_camera_sensor_get(); sensor_t * s = esp_camera_sensor_get();
if (s != NULL) {
if (s->id.PID == OV3660_PID) { if (s->id.PID == OV3660_PID) {
return httpd_resp_send(req, (const char *)index_ov3660_html_gz_start, index_ov3660_html_gz_len); return httpd_resp_send(req, (const char *)index_ov3660_html_gz_start, index_ov3660_html_gz_len);
} } else {
return httpd_resp_send(req, (const char *)index_ov2640_html_gz_start, index_ov2640_html_gz_len); return httpd_resp_send(req, (const char *)index_ov2640_html_gz_start, index_ov2640_html_gz_len);
} }
} else {
ESP_LOGE(TAG,"Camera sensor not found");
return httpd_resp_send_500(req);
}
}
void app_httpd_main(){ void app_httpd_main(){
httpd_config_t config = HTTPD_DEFAULT_CONFIG(); httpd_config_t config = HTTPD_DEFAULT_CONFIG();