|
 |
1c1f09 |
From 9fe889dbd9e97ee947f13da3c86891940a1a1406 Mon Sep 17 00:00:00 2001
|
|
|
1c1f09 |
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
1c1f09 |
Date: Thu, 6 Apr 2017 17:12:24 +0100
|
|
|
1c1f09 |
Subject: [PATCH] Restore correct size of reserved data
|
|
|
1c1f09 |
|
|
|
1c1f09 |
A previous commit
|
|
|
1c1f09 |
|
|
|
1c1f09 |
commit 7a9271620c894931cc22d6587d58e46c5996dac3
|
|
|
1c1f09 |
Author: Lei Li <lilei@linux.vnet.ibm.com>
|
|
|
1c1f09 |
Date: Mon May 20 11:45:59 2013 +0100
|
|
|
1c1f09 |
|
|
|
1c1f09 |
Add support for LED state extension to gvnc
|
|
|
1c1f09 |
|
|
|
1c1f09 |
removed 4 elements from the reserved data field, when adding
|
|
|
1c1f09 |
one pointer. This is because it mistakenly thought the reserved
|
|
|
1c1f09 |
elements were 1 byte in length, when they are in fact one pointer
|
|
|
1c1f09 |
in size.
|
|
|
1c1f09 |
|
|
|
1c1f09 |
The original change was technically an ABI incompatible change,
|
|
|
1c1f09 |
as is this fix. In practice, however, GObject classes are never
|
|
|
1c1f09 |
instantiated statically at compile time. Instead a call to
|
|
|
1c1f09 |
g_type_register_static is made at runtime. So this change in the
|
|
|
1c1f09 |
class size won't have a negative effect unless someone has
|
|
|
1c1f09 |
subclassed the VncConnectionClass type. Even if subclassing, this
|
|
|
1c1f09 |
should be harmless as we've merely increased the memory allocation
|
|
|
1c1f09 |
by 3 words.
|
|
|
1c1f09 |
|
|
|
1c1f09 |
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
|
|
1c1f09 |
(cherry picked from commit 77bd7cd620a1f9d45f9d479b55a5cba807732b91)
|
|
|
1c1f09 |
---
|
|
|
1c1f09 |
src/vncconnection.h | 2 +-
|
|
|
1c1f09 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
1c1f09 |
|
|
|
1c1f09 |
diff --git a/src/vncconnection.h b/src/vncconnection.h
|
|
|
1c1f09 |
index 8c1fa28..3477d1b 100644
|
|
|
1c1f09 |
--- a/src/vncconnection.h
|
|
|
1c1f09 |
+++ b/src/vncconnection.h
|
|
|
1c1f09 |
@@ -85,7 +85,7 @@ struct _VncConnectionClass
|
|
|
1c1f09 |
* If adding fields to this struct, remove corresponding
|
|
|
1c1f09 |
* amount of padding to avoid changing overall struct size
|
|
|
1c1f09 |
*/
|
|
|
1c1f09 |
- gpointer _vnc_reserved[VNC_PADDING_LARGE - 5];
|
|
|
1c1f09 |
+ gpointer _vnc_reserved[VNC_PADDING_LARGE - 2];
|
|
|
1c1f09 |
};
|
|
|
1c1f09 |
|
|
|
1c1f09 |
|