Skip to content

Commit

Permalink
DO NOT use C++ comments!
Browse files Browse the repository at this point in the history
  • Loading branch information
foobar committed May 19, 2002
1 parent ccd962e commit 3b9401a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions ext/domxml/php_domxml.c
Expand Up @@ -466,7 +466,7 @@ zend_module_entry domxml_module_entry = {
PHP_RINIT(domxml),
NULL,
PHP_MINFO(domxml),
DOMXML_API_VERSION, //Extension versionnumber
DOMXML_API_VERSION, /* Extension versionnumber */
STANDARD_MODULE_PROPERTIES
};

Expand Down Expand Up @@ -2096,7 +2096,7 @@ PHP_FUNCTION(domxml_node_append_sibling)
RETURN_FALSE;
}

// FIXME reverted xmlAddChildList; crashes
/* FIXME reverted xmlAddChildList; crashes */
child = xmlAddSibling(nodep, new_child);

if (NULL == child) {
Expand Down
6 changes: 5 additions & 1 deletion ext/exif/exif.c
Expand Up @@ -2253,9 +2253,11 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
/* If its bigger than 4 bytes, the dir entry contains an offset. */
value_ptr = offset_base+offset_val;
if (offset_val+byte_count > IFDlength || value_ptr < dir_entry) {
/*
// It is important to check for IMAGE_FILETYPE_TIFF
// JPEG does not use absolute pointers instead its pointers are relative to the start
// of the TIFF header in APP1 section.
*/
if (offset_val<0 || offset_val+byte_count>ImageInfo->FileSize || (ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_II && ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_MM)) {
if (value_ptr < dir_entry) {
/* we can read this if offset_val > 0 */
Expand All @@ -2269,19 +2271,21 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
return TRUE;
}
if (byte_count>sizeof(cbuf)) {
// mark as outside range and get buffer
/* mark as outside range and get buffer */
value_ptr = emalloc(byte_count);
if (!value_ptr) {
EXIF_ERRLOG_EALLOC
return FALSE;
}
outside = value_ptr;
} else {
/*
// in most cases we only access a small range so
// it is faster to use a static buffer there
// BUT it offers also the possibility to have
// pointers read without the need to free them
// explicitley before returning.
*/
value_ptr = cbuf;
}

Expand Down

0 comments on commit 3b9401a

Please sign in to comment.