|
 |
4f57de |
diff --git a/PIL/Image.py b/PIL/Image.py
|
|
|
4f57de |
index cafc5a2..794ee49 100644
|
|
|
4f57de |
--- a/PIL/Image.py
|
|
|
4f57de |
+++ b/PIL/Image.py
|
|
|
4f57de |
@@ -718,7 +718,7 @@ class Image:
|
|
|
4f57de |
if self.mode == "L" and mode == "RGBA" and "transparency" in self.info:
|
|
|
4f57de |
from PIL import ImagePalette
|
|
|
4f57de |
self.mode = "P"
|
|
|
4f57de |
- bytePalette = bytes([i//3 for i in range(768)])
|
|
|
4f57de |
+ bytePalette = bytes(bytearray([i//3 for i in range(768)]))
|
|
|
4f57de |
self.palette = ImagePalette.raw("RGB", bytePalette)
|
|
|
4f57de |
self.palette.dirty = 1
|
|
|
4f57de |
self.load()
|
|
|
4f57de |
diff --git a/_imaging.c b/_imaging.c
|
|
|
4f57de |
index 2ee7eef..6ec7346 100644
|
|
|
4f57de |
--- a/_imaging.c
|
|
|
4f57de |
+++ b/_imaging.c
|
|
|
4f57de |
@@ -286,6 +286,7 @@ static const char* wrong_mode = "unrecognized image mode";
|
|
|
4f57de |
static const char* wrong_raw_mode = "unrecognized raw mode";
|
|
|
4f57de |
static const char* outside_image = "image index out of range";
|
|
|
4f57de |
static const char* outside_palette = "palette index out of range";
|
|
|
4f57de |
+static const char* wrong_palette_size = "invalid palette size";
|
|
|
4f57de |
static const char* no_palette = "image has no palette";
|
|
|
4f57de |
static const char* readonly = "image is readonly";
|
|
|
4f57de |
/* static const char* no_content = "image has no content"; */
|
|
|
4f57de |
@@ -1412,6 +1413,11 @@ _putpalette(ImagingObject* self, PyObject* args)
|
|
|
4f57de |
return NULL;
|
|
|
4f57de |
}
|
|
|
4f57de |
|
|
|
4f57de |
+ if ( palettesize * 8 / bits > 256) {
|
|
|
4f57de |
+ PyErr_SetString(PyExc_ValueError, wrong_palette_size);
|
|
|
4f57de |
+ return NULL;
|
|
|
4f57de |
+ }
|
|
|
4f57de |
+
|
|
|
4f57de |
ImagingPaletteDelete(self->image->palette);
|
|
|
4f57de |
|
|
|
4f57de |
strcpy(self->image->mode, "P");
|