mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-10 21:12:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

[project @ 2004-07-10 10:05:16 by bursa]

Browse Source 
Fix crash related to aborting fetches.

svn path=/import/netsurf/; revision=1067
This commit is contained in:
James Bursa 2004-07-10 10:05:16 +00:00
parent ba22b4e753
commit 48130c473b
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
content/fetch.c
View File

@ -548,6 +548,7 @@ void fetch_done(CURL *curl_handle, CURLcode result)
{ {
bool finished = false; bool finished = false;
bool error = false; bool error = false;
bool abort;
struct fetch *f; struct fetch *f;
void *p; void *p;
void (*callback)(fetch_msg msg, void *p, const char *data, void (*callback)(fetch_msg msg, void *p, const char *data,
@ -558,6 +559,7 @@ void fetch_done(CURL *curl_handle, CURLcode result)
code = curl_easy_getinfo(curl_handle, CURLINFO_PRIVATE, &f); code = curl_easy_getinfo(curl_handle, CURLINFO_PRIVATE, &f);
assert(code == CURLE_OK); assert(code == CURLE_OK);
abort = f->abort;
callback = f->callback; callback = f->callback;
p = f->p; p = f->p;
@ -578,7 +580,9 @@ void fetch_done(CURL *curl_handle, CURLcode result)
fetch_stop(f); fetch_stop(f);
/* postponed until after stop so that queue fetches are started */ /* postponed until after stop so that queue fetches are started */
if (finished) if (abort)
; /* fetch was aborted: no callback */
else if (finished)
callback(FETCH_FINISHED, p, 0, 0); callback(FETCH_FINISHED, p, 0, 0);
else if (error) else if (error)
callback(FETCH_ERROR, p, fetch_error_buffer, 0); callback(FETCH_ERROR, p, fetch_error_buffer, 0);
@ -586,26 +590,29 @@ void fetch_done(CURL *curl_handle, CURLcode result)
/** /**
* Callback function for fetch progress * Callback function for fetch progress.
*/ */
int fetch_curl_progress(void *clientp, double dltotal, double dlnow, int fetch_curl_progress(void *clientp, double dltotal, double dlnow,
double ultotal, double ulnow) double ultotal, double ulnow)
{ {
struct fetch *f = (struct fetch *)clientp; struct fetch *f = (struct fetch *) clientp;
double percent; double percent;
if (f->abort)
return 0;
if (dltotal > 0) { if (dltotal > 0) {
percent = dlnow * 100.0f / dltotal; percent = dlnow * 100.0f / dltotal;
snprintf(fetch_progress_buffer, 255, snprintf(fetch_progress_buffer, 255,
messages_get("Progress"), messages_get("Progress"),
human_friendly_bytesize(dlnow), human_friendly_bytesize(dlnow),
human_friendly_bytesize(dltotal)); human_friendly_bytesize(dltotal));
f->callback(FETCH_PROGRESS, f->p, fetch_progress_buffer, f->callback(FETCH_PROGRESS, f->p, fetch_progress_buffer,
(unsigned long)percent); (unsigned long) percent);
} } else {
else {
snprintf(fetch_progress_buffer, 255, snprintf(fetch_progress_buffer, 255,
messages_get("ProgressU"), messages_get("ProgressU"),
human_friendly_bytesize(dlnow)); human_friendly_bytesize(dlnow));
f->callback(FETCH_PROGRESS, f->p, fetch_progress_buffer, 0); f->callback(FETCH_PROGRESS, f->p, fetch_progress_buffer, 0);
} }