Attachment 904785 Details for Bug 1106594 – rpm-4.11.2-dynamic-buf-allocation.patch

[patch] rpm-4.11.2-dynamic-buf-allocation.patch

rpm-4.11.2-dynamic-buf-allocation.patch (text/plain), 1.27 KB, created by Peter Schiffer on 2014-06-09 16:06:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Schiffer

Created: 2014-06-09 16:06:48 UTC

Size: 1.27 KB

patch

obsolete

>diff -upr rpm-4.11.2.orig/rpmio/rpmfileutil.c rpm-4.11.2/rpmio/rpmfileutil.c
>--- rpm-4.11.2.orig/rpmio/rpmfileutil.c	2014-02-05 14:04:02.000000000 +0100
>+++ rpm-4.11.2/rpmio/rpmfileutil.c	2014-06-09 17:03:43.048039190 +0200
>@@ -146,8 +146,8 @@ int rpmDoDigest(int algo, const char * f
>     const char * path;
>     urltype ut = urlPath(fn, &path);
>     unsigned char * dig = NULL;
>-    size_t diglen;
>-    unsigned char buf[32*BUFSIZ];
>+    size_t diglen, buflen = 32*BUFSIZ;
>+    unsigned char *buf = NULL;
>     FD_t fd;
>     rpm_loff_t fsize = 0;
>     pid_t pid = 0;
>@@ -160,6 +160,11 @@ int rpmDoDigest(int algo, const char * f
> 	goto exit;
>     }
> 
>+    if (!(buf = calloc(buflen, sizeof(unsigned char)))) {
>+        rc = 1;
>+        goto exit;
>+    }
>+
>     switch(ut) {
>     case URL_IS_PATH:
>     case URL_IS_UNKNOWN:
>@@ -181,7 +186,7 @@ int rpmDoDigest(int algo, const char * f
> 	
> 	fdInitDigest(fd, algo, 0);
> 	fsize = 0;
>-	while ((rc = Fread(buf, sizeof(buf[0]), sizeof(buf), fd)) > 0)
>+	while ((rc = Fread(buf, sizeof(buf[0]), buflen, fd)) > 0)
> 	    fsize += rc;
> 	fdFiniDigest(fd, algo, (void **)&dig, &diglen, asAscii);
> 	if (dig == NULL || Ferror(fd))
>@@ -205,6 +210,7 @@ exit:
>     if (!rc)
> 	memcpy(digest, dig, diglen);
>     dig = _free(dig);
>+    free(buf);
> 
>     return rc;
> }

Actions: View | Diff

Attachments on bug 1106594: 904784 | 904785