Merge stage-dr1-aosp-master into stage-aosp-master

Bug: 112535855
Change-Id: I1f1f2f8f6588c49411186404505841bbca8119a4

1 files changed, 4 insertions, 3 deletions

diff --git a/xf86drmMode.c b/xf86drmMode.c
index 9a15b5e7..b0ec609b 100644
--- a/xf86drmMode.c
+++ b/xf86drmMode.c
@@ -1250,7 +1250,7 @@ drmModeAtomicReqPtr drmModeAtomicDuplicate(drmModeAtomicReqPtr old)
                         return NULL;
                 }
                 memcpy(new->items, old->items,
-                       old->size_items * sizeof(*new->items));
+                       old->cursor * sizeof(*new->items));
         } else {
                 new->items = NULL;
         }
@@ -1312,12 +1312,13 @@ int drmModeAtomicAddProperty(drmModeAtomicReqPtr req,
                 return -EINVAL;
 
         if (req->cursor >= req->size_items) {
+                const uint32_t item_size_inc = getpagesize() / sizeof(*req->items);
                 drmModeAtomicReqItemPtr new;
 
-                req->size_items += 16;
+                req->size_items += item_size_inc;
                 new = realloc(req->items, req->size_items * sizeof(*req->items));
                 if (!new) {
-                        req->size_items -= 16;
+                        req->size_items -= item_size_inc;
                         return -ENOMEM;
                 }
                 req->items = new;