Skip to content

Call http.end() if deserializing JSON fails #72

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
merged 2 commits into from
Jan 24, 2022
Merged

Call http.end() if deserializing JSON fails #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
547e801
Minor cleanup
thorrak Jan 23, 2022
6d803be
Call http.end() if deserializing JSON fails
thorrak Jan 23, 2022
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
10 changes: 5 additions & 5 deletions src/esp32fota.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@

#include <WiFiClientSecure.h>

esp32FOTA::esp32FOTA(String firwmareType, int firwmareVersion, boolean validate )
esp32FOTA::esp32FOTA(String firmwareType, int firmwareVersion, boolean validate)
{
_firwmareType = firwmareType;
_firwmareVersion = firwmareVersion;
_firmwareType = firmwareType;
_firmwareVersion = firmwareVersion;
_check_sig = validate;
useDeviceID = false;
}
Expand Down Expand Up @@ -338,7 +338,7 @@ bool esp32FOTA::execHTTPcheck()

if (err) { //Check for errors in parsing
log_e("Parsing failed");
delay(5000);
http.end();
return false;
}

Expand All @@ -357,7 +357,7 @@ bool esp32FOTA::execHTTPcheck()

String fwtype(pltype);

if (plversion > _firwmareVersion && fwtype == _firwmareType) {
if (plversion > _firmwareVersion && fwtype == _firmwareType) {
http.end();
return true;
}
Expand Down
4 changes: 2 additions & 2 deletions src/esp32fota.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ class esp32FOTA

private:
String getDeviceID();
String _firwmareType;
int _firwmareVersion;
String _firmwareType;
int _firmwareVersion;
int _payloadVersion;
String _host;
String _bin;
Expand Down