Skip to content

Encode URL for lubcurl, such as spaces to %20 #780

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Encode URL for lubcurl, such as spaces to %20 #780

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
25 changes: 24 additions & 1 deletion src/imlib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,8 @@ static char *feh_http_load_image(char *url)
{
CURL *curl;
CURLcode res;
CURLU *curlu;
char *encoded;
char *sfn;
FILE *sfp;
int fd = -1;
Expand Down Expand Up @@ -859,6 +861,26 @@ static char *feh_http_load_image(char *url)
return NULL;
}

/* libcurl requires encoded URL */
/* for example, spaces as %20 */
curlu = curl_url();
if (curl_url_set(curlu, CURLUPART_URL, url, CURLU_URLENCODE) != CURLUE_OK) {
weprintf("open url: Invalid URL");
curl_url_cleanup(curlu);
curl_easy_cleanup(curl);
return NULL;
}

if (curl_url_get(curlu, CURLUPART_URL, &encoded, 0) != CURLUE_OK) {
weprintf("open url: Invalid URL");
curl_url_cleanup(curlu);
curl_easy_cleanup(curl);
return NULL;
}
curl_url_cleanup(curlu);

D(("url %s, encoded %s\n", url, encoded))

basename = strrchr(url, '/') + 1;

#ifdef HAVE_MKSTEMPS
Expand Down Expand Up @@ -899,7 +921,7 @@ static char *feh_http_load_image(char *url)
* feh hanging indefinitely in unattended slideshows.
*/
curl_easy_setopt(curl, CURLOPT_TIMEOUT, 1800);
curl_easy_setopt(curl, CURLOPT_URL, url);
curl_easy_setopt(curl, CURLOPT_URL, encoded);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, sfp);
ebuff = emalloc(CURL_ERROR_SIZE);
curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, ebuff);
Expand Down Expand Up @@ -952,6 +974,7 @@ static char *feh_http_load_image(char *url)
#endif
free(sfn);
}
curl_free(encoded);
curl_easy_cleanup(curl);
return NULL;
}
Expand Down