moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2026-04-13 19:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Safely handle missing fields in the serverinfo response. This fixes GFE 2.5.4.54, albeit in a non-ideal manner. A proper fix would be to parse the error out of the response and reissue the query over HTTP if it fails with error code 401.

Browse Source
This commit is contained in:
Cameron Gutman
2015-06-19 23:41:20 -04:00
parent fa4f1a323a
commit 91386f554e
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/client.c
View File

@@ -124,7 +124,10 @@ static void client_load_server_status(const char *address) {
paired = pairedText != NULL && strcmp(pairedText, "1") == 0; paired = pairedText != NULL && strcmp(pairedText, "1") == 0;
currentGame = currentGameText == NULL ? 0 : atoi(currentGameText); currentGame = currentGameText == NULL ? 0 : atoi(currentGameText);
strstr(versionText, ".")[0] = 0; char *versionSep = strstr(versionText, ".");
if (versionSep != NULL) {
*versionSep = 0;
}
serverMajorVersion = atoi(versionText); serverMajorVersion = atoi(versionText);
free(pairedText); free(pairedText);
@@ -306,7 +309,7 @@ void client_pair(const char *address) {
sprintf(url, "https://%s:47984/pair?uniqueid=%s&devicename=roth&updateState=1&clientpairingsecret=%s", address, unique_id, client_pairing_secret_hex); sprintf(url, "https://%s:47984/pair?uniqueid=%s&devicename=roth&updateState=1&clientpairingsecret=%s", address, unique_id, client_pairing_secret_hex);
http_request(url, data); http_request(url, data);
sprintf(url, "https://%s:47984/pair?uniqueid=%s&devicename=roth&updateState=1&phrase=pairchallenge", address, unique_id, challenge_response_hex); sprintf(url, "https://%s:47984/pair?uniqueid=%s&devicename=roth&updateState=1&phrase=pairchallenge", address, unique_id);
http_request(url, data); http_request(url, data);
http_free_data(data); http_free_data(data);

4
src/xml.c
View File

@@ -92,7 +92,7 @@ int xml_search(char* data, size_t len, char* node, char** result) {
struct xml_query search; struct xml_query search;
search.data = node; search.data = node;
search.start = 0; search.start = 0;
search.memory = malloc(1); search.memory = calloc(1, 1);
search.size = 0; search.size = 0;
XML_Parser parser = XML_ParserCreate("UTF-8"); XML_Parser parser = XML_ParserCreate("UTF-8");
XML_SetUserData(parser, &search); XML_SetUserData(parser, &search);
@@ -110,7 +110,7 @@ int xml_search(char* data, size_t len, char* node, char** result) {
struct app_list* xml_applist(char* data, size_t len) { struct app_list* xml_applist(char* data, size_t len) {
struct xml_query query; struct xml_query query;
query.memory = malloc(1); query.memory = calloc(1, 1);
query.size = 0; query.size = 0;
query.start = 0; query.start = 0;
query.data = NULL; query.data = NULL;