From 70edd6e78312f8357776c81f6b5124a96233b5b2 Mon Sep 17 00:00:00 2001 From: Cyril Hrubis Date: Sat, 8 Feb 2014 00:52:49 +0100 Subject: [PATCH] loaders: ZIP: Propagate errno from GP_ReadImage() Propagate errno from GP_ReadImage() from zip_next_file() if loading was canceled from callback. Signed-off-by: Cyril Hrubis --- libs/loaders/GP_ZIP.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/loaders/GP_ZIP.c b/libs/loaders/GP_ZIP.c index c0b417a1..ec80e963 100644 --- a/libs/loaders/GP_ZIP.c +++ b/libs/loaders/GP_ZIP.c @@ -379,6 +379,8 @@ static GP_Context *zip_next_file(struct zip_priv *priv, GP_IOMark(priv->io, GP_IO_MARK); ret = GP_ReadImage(priv->io, callback); + if (errno == ECANCELED) + err = errno; GP_IOSeek(priv->io, priv->io->mark + header.comp_size, GP_IO_SEEK_SET); @@ -391,6 +393,8 @@ static GP_Context *zip_next_file(struct zip_priv *priv, } GP_DEBUG(1, "Reading image"); ret = GP_ReadImage(io, callback); + if (errno == ECANCELED) + err = errno; GP_IOClose(io); goto out; -- 2.11.4.GIT