xf86-video-intel: 2 commits - src/sna/sna_display.c tools/cursor.c

[Chris Wilson]

 src/sna/sna_display.c |    8 +++++++-
 tools/cursor.c        |    3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 7301516b63d2e5fcd594f1e50a0f7b3b9bb5cadb
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jul 21 14:09:01 2015 +0100

    tools/cursor: Error on malloc failure
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/tools/cursor.c b/tools/cursor.c
index 31d45d7..6f4e3f8 100644
--- a/tools/cursor.c
+++ b/tools/cursor.c
@@ -78,6 +78,9 @@ int main(int argc, char **argv)
 
 	src = cur->pixels;
 	rows = malloc(cur->height*sizeof(png_byte*));
+	if (rows == NULL)
+		return 3;
+
 	for (y = 0; y < cur->height; y++) {
 		rows[y] = malloc(cur->width * 4);
 		for (x = 0; x < cur->width; x++) {
commit 18b947b99919e7a1b8a80eda47fa29bf8675bc69
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jul 21 14:05:40 2015 +0100

    sna: Abort output construction on allocation failure
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 69667ad..e1264db 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -4526,6 +4526,12 @@ sna_output_add(struct sna *sna, unsigned id, unsigned serial)
 	sna_output->num_props = compat_conn.conn.count_props;
 	sna_output->prop_ids = malloc(sizeof(uint32_t)*compat_conn.conn.count_props);
 	sna_output->prop_values = malloc(sizeof(uint64_t)*compat_conn.conn.count_props);
+	if (sna_output->prop_ids == NULL || sna_output->prop_values == NULL) {
+		free(sna_output->prop_ids);
+		free(sna_output->prop_values);
+		free(sna_output);
+		return -1;
+	}
 
 	compat_conn.conn.count_encoders = 0;
 
@@ -8240,7 +8246,7 @@ void sna_mode_redisplay(struct sna *sna)
 							    sna_crtc->bo->tiling,
 							    CREATE_SCANOUT);
 				if (bo == NULL)
-					goto disable1;
+					continue;
 
 				sna_crtc_redisplay(crtc, &damage, bo);
 				kgem_bo_submit(&sna->kgem, bo);