forked from pool/libvirt
a93eba1929
bnc#609738 xend-buff-size.patch - Add upstream fixes to bitmap code that was introduced to fix bnc#594024 bitmap-alloc.patch bitmap-fixes.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=55
30 lines
863 B
Diff
30 lines
863 B
Diff
commit ce49cfb48ad5e9cac79819d0ccde4394c237af25
|
|
Author: Eric Blake <eblake@redhat.com>
|
|
Date: Wed Jun 2 09:03:57 2010 -0600
|
|
|
|
bitmap: reject zero-size bitmap
|
|
|
|
* src/util/bitmap.c (virBitmapAlloc): Tighten sanity check.
|
|
|
|
diff --git a/src/util/bitmap.c b/src/util/bitmap.c
|
|
index 69094a5..44edb49 100644
|
|
--- a/src/util/bitmap.c
|
|
+++ b/src/util/bitmap.c
|
|
@@ -1,6 +1,7 @@
|
|
/*
|
|
* bitmap.h: Simple bitmap operations
|
|
*
|
|
+ * Copyright (C) 2010 Red Hat, Inc.
|
|
* Copyright (C) 2010 Novell, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
@@ -58,7 +59,7 @@ virBitmapPtr virBitmapAlloc(size_t size)
|
|
virBitmapPtr bitmap;
|
|
size_t sz;
|
|
|
|
- if (SIZE_MAX - VIR_BITMAP_BITS_PER_UNIT < size)
|
|
+ if (SIZE_MAX - VIR_BITMAP_BITS_PER_UNIT < size || size == 0)
|
|
return NULL;
|
|
|
|
sz = (size + VIR_BITMAP_BITS_PER_UNIT - 1) /
|