Changeset 3143 for libcaca/trunk/caca-php/php_caca.cTweet

Timestamp:

Oct 30, 2008, 1:51:55 AM (12 years ago)

Author:

nico

Message:

• Add check after emalloc in caca_draw_thin_polyline

File:

• libcaca/trunk/caca-php/php_caca.c (modified) (7 diffs)

libcaca/trunk/caca-php/php_caca.c

@@ -688 +688 @@
 
 PHP_FUNCTION(caca_attr_to_argb64) {
+        //TODO: write or delete
 }
 
 PHP_FUNCTION(caca_utf8_to_utf32) {
+        //TODO: write or delete
 }
 
 PHP_FUNCTION(caca_utf32_to_utf8) {
+        //TODO: write or delete
 }
 
@@ -797 +800 @@
         tbl_x = malloc(sizeof(int) * lenmax);
         tbl_y = malloc(sizeof(int) * lenmax);
+
+        if (!tbl_x || !tbl_y) {
+                RETURN_FALSE;
+        }
         
         HashPosition pos;
@@ -1041 +1048 @@
         int i, j;
         for (i = 0; i < 256; i++) {
-                if (zend_hash_index_find(Z_ARRVAL_P(arr), i, (void**) &color) == FAILURE | Z_TYPE_P(*color) != IS_ARRAY) {
+                if (zend_hash_index_find(Z_ARRVAL_P(arr), i, (void**) &color) == FAILURE || Z_TYPE_P(*color) != IS_ARRAY) {
                         RETURN_FALSE;
                 }
@@ -1065 +1072 @@
 
         gdImage *img = fetch_external_resource(_zval2, "gd");
-        if (!img | img->trueColor | gdMaxColors != 256) {
+        if (!img || img->trueColor || gdMaxColors != 256) {
                 RETURN_FALSE;
         }
@@ -1157 +1164 @@
 
 PHP_FUNCTION(caca_get_dither_antialias_list) {
+        //TODO: write
 }
 
@@ -1362 +1370 @@
 
 PHP_FUNCTION(caca_render_canvas) {
+        //TODO: write
 }
 
@@ -1547 +1556 @@
         buffer = caca_export_memory(canvas, type, &len);
         copy = emalloc(len);
-        if (!buffer | !copy) {
+        if (!buffer || !copy) {
                 RETURN_FALSE;
         }