luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-06-02 02:40:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

g_output_stream_splice: deal with overflow

Browse Source 
On 32-bit machines in particular, bytes_written may overflow a gssize.
Notice when that happens and just return G_MAXSSIZE instead.

https://bugzilla.gnome.org/show_bug.cgi?id=649246
This commit is contained in:
Dan Winship 2011-06-07 17:15:17 -04:00
parent 3b4a42d631
commit 37ab5ced31
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gio/goutputstream.c
View File

@ -348,7 +348,10 @@ g_output_stream_flush (GOutputStream *stream,
* Splices an input stream into an output stream. * Splices an input stream into an output stream.
* *
* Returns: a #gssize containing the size of the data spliced, or * Returns: a #gssize containing the size of the data spliced, or
* -1 if an error occurred. * -1 if an error occurred. Note that if the number of bytes
* spliced is greater than %G_MAXSSIZE, then that will be
* returned, and there is no way to determine the actual number
* of bytes spliced.
**/ **/
gssize gssize
g_output_stream_splice (GOutputStream *stream, g_output_stream_splice (GOutputStream *stream,
@ -397,7 +400,7 @@ g_output_stream_real_splice (GOutputStream *stream,
{ {
GOutputStreamClass *class = G_OUTPUT_STREAM_GET_CLASS (stream); GOutputStreamClass *class = G_OUTPUT_STREAM_GET_CLASS (stream);
gssize n_read, n_written; gssize n_read, n_written;
gssize bytes_copied; gsize bytes_copied;
char buffer[8192], *p; char buffer[8192], *p;
gboolean res; gboolean res;
@ -437,6 +440,9 @@ g_output_stream_real_splice (GOutputStream *stream,
n_read -= n_written; n_read -= n_written;
bytes_copied += n_written; bytes_copied += n_written;
} }
if (bytes_copied > G_MAXSSIZE)
bytes_copied = G_MAXSSIZE;
} }
while (res); while (res);
@ -880,7 +886,10 @@ g_output_stream_splice_async (GOutputStream *stream,
* *
* Finishes an asynchronous stream splice operation. * Finishes an asynchronous stream splice operation.
* *
* Returns: a #gssize of the number of bytes spliced. * Returns: a #gssize of the number of bytes spliced. Note that if the
* number of bytes spliced is greater than %G_MAXSSIZE, then that
* will be returned, and there is no way to determine the actual
* number of bytes spliced.
**/ **/
gssize gssize
g_output_stream_splice_finish (GOutputStream *stream, g_output_stream_splice_finish (GOutputStream *stream,