shithub: masto9

Info  •  Files  •  Log  •  Branches

fix for remote_url returning nil crashes program

--- a/masto9.c

+++ b/masto9.c

@@ -71,7 +71,7 @@

 {

 	JSON *obj, *id, *content, *reblogcontent, *account, *reblogaccount, *handle,

 		*rebloghandle, *displayname, *avatar, *reblog, *mediaattachments, *type,

-		*previewurl, *remoteurl;

+		*previewurl, *remoteurl, *baseurl;

 	char *endpoint;

 	int i = 0;

@@ -127,12 +127,15 @@

 				type = getjsonkey(attachmentjson, "type");

 				previewurl = getjsonkey(attachmentjson, "preview_url");

 				remoteurl = getjsonkey(attachmentjson, "remote_url");

+				baseurl   = getjsonkey(attachmentjson, "url");

 				attachment->type = estrdup((char *)type->s);

 				if(strcmp(type->s, "image") == 0) {

 					attachment->url = estrdup((char *)previewurl->s);

-				} else {

+				} else if(remoteurl->s != 0) {

 					attachment->url = estrdup((char *)remoteurl->s);

+				} else {

+					attachment->url = estrdup((char*)baseurl->s);

 				}

 				toot->mediaattachments[j] = attachment;