File tree 2 files changed +39
-3
lines changed
2 files changed +39
-3
lines changed Original file line number Diff line number Diff line change
1
+ --TEST--
2
+ Operations on uninitialized tidy object
3
+ --SKIPIF--
4
+ <?php if (!extension_loaded ("tidy " )) print "skip " ; ?>
5
+ --FILE--
6
+ <?php
7
+
8
+ $ tidy = new tidy ;
9
+ try {
10
+ var_dump ($ tidy ->getHtmlVer ());
11
+ } catch (Error $ e ) {
12
+ echo $ e ->getMessage (), "\n" ;
13
+ }
14
+ try {
15
+ var_dump ($ tidy ->isXhtml ());
16
+ } catch (Error $ e ) {
17
+ echo $ e ->getMessage (), "\n" ;
18
+ }
19
+ try {
20
+ var_dump ($ tidy ->isXml ());
21
+ } catch (Error $ e ) {
22
+ echo $ e ->getMessage (), "\n" ;
23
+ }
24
+
25
+ ?>
26
+ --EXPECT--
27
+ tidy object is not initialized
28
+ tidy object is not initialized
29
+ tidy object is not initialized
Original file line number Diff line number Diff line change 66
66
} \
67
67
obj = Z_TIDY_P(object); \
68
68
69
+ #define TIDY_FETCH_INITIALIZED_OBJECT \
70
+ TIDY_FETCH_OBJECT; \
71
+ if (!obj->ptdoc->initialized) { \
72
+ zend_throw_error(NULL, "tidy object is not initialized"); \
73
+ return; \
74
+ }
75
+
69
76
#define TIDY_FETCH_ONLY_OBJECT \
70
77
PHPTidyObj *obj; \
71
78
TIDY_SET_CONTEXT; \
@@ -1474,7 +1481,7 @@ static PHP_FUNCTION(tidy_get_status)
1474
1481
Get the Detected HTML version for the specified document. */
1475
1482
static PHP_FUNCTION (tidy_get_html_ver )
1476
1483
{
1477
- TIDY_FETCH_OBJECT ;
1484
+ TIDY_FETCH_INITIALIZED_OBJECT ;
1478
1485
1479
1486
RETURN_LONG (tidyDetectedHtmlVersion (obj -> ptdoc -> doc ));
1480
1487
}
@@ -1484,7 +1491,7 @@ static PHP_FUNCTION(tidy_get_html_ver)
1484
1491
Indicates if the document is a XHTML document. */
1485
1492
static PHP_FUNCTION (tidy_is_xhtml )
1486
1493
{
1487
- TIDY_FETCH_OBJECT ;
1494
+ TIDY_FETCH_INITIALIZED_OBJECT ;
1488
1495
1489
1496
RETURN_BOOL (tidyDetectedXhtml (obj -> ptdoc -> doc ));
1490
1497
}
@@ -1494,7 +1501,7 @@ static PHP_FUNCTION(tidy_is_xhtml)
1494
1501
Indicates if the document is a generic (non HTML/XHTML) XML document. */
1495
1502
static PHP_FUNCTION (tidy_is_xml )
1496
1503
{
1497
- TIDY_FETCH_OBJECT ;
1504
+ TIDY_FETCH_INITIALIZED_OBJECT ;
1498
1505
1499
1506
RETURN_BOOL (tidyDetectedGenericXml (obj -> ptdoc -> doc ));
1500
1507
}
You can’t perform that action at this time.
0 commit comments