Changeset 3128Tweet

Timestamp:

Oct 28, 2008, 1:15:15 PM (14 years ago)

Author:

nico

Message:

• Add checks after emalloc()
• Add php binding for caca_file_gets

File:

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

libcaca/trunk/caca-php/php_caca.c

@@ -379 +379 @@
         caca_event_t *event;
         event = emalloc(sizeof(caca_event_t));
+        if (!event) {
+                RETURN_FALSE;
+        }
         ZEND_REGISTER_RESOURCE(return_value, event, le_caca_event);
 }
@@ -1303 +1306 @@
         ZEND_FETCH_RESOURCE(file, caca_file_t*, &_zval, -1, PHP_CACA_FILE_RES_NAME, le_caca_file);
 
+        if (len < 1) {
+                RETURN_FALSE;
+        }
         char *buffer = emalloc(len);
+        if (!buffer) {
+                RETURN_FALSE;
+        }
         caca_file_read(file, buffer, len);
 
@@ -1324 +1333 @@
 
 PHP_FUNCTION(caca_file_gets) {
+        zval *_zval;
+        long len = 0;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &_zval, &len) == FAILURE) {
+                RETURN_FALSE;
+        }
+        caca_file_t *file;
+        ZEND_FETCH_RESOURCE(file, caca_file_t*, &_zval, -1, PHP_CACA_FILE_RES_NAME, le_caca_file);
+
+        if (len < 1) {
+                RETURN_FALSE;
+        }
+        char *buffer = emalloc(len);
+        if (!buffer) {
+                RETURN_FALSE;
+        }
+        char *result = caca_file_gets(file, buffer, len);
+        if (!result) {
+                RETURN_FALSE;
+        }
+        return_value->type = IS_STRING;
+        return_value->value.str.len = len;
+        return_value->value.str.val = result;
 }
 
@@ -1380 +1411 @@
         ZEND_FETCH_RESOURCE(canvas, caca_canvas_t*, &_zval, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
 
-        void *buffer;
+        void *buffer, *copy;
         size_t len;
         buffer = caca_export_memory(canvas, type, &len);
-        if (!buffer) {
-                RETURN_FALSE;
-        }
+        copy = emalloc(len);
+        if (!buffer | !copy) {
+                RETURN_FALSE;
+        }
+        memcpy(copy, buffer, len);
+        free(buffer);
+
         return_value->type = IS_STRING;
         return_value->value.str.len = len;
-        return_value->value.str.val = emalloc(len);
-        memcpy(return_value->value.str.val, buffer, len);
-        free(buffer);
+        return_value->value.str.val = copy;
 }