@@ -1336,10 +1336,13 @@ PHP_FUNCTION(curl_getinfo)
1336
1336
switch (option ) {
1337
1337
case CURLINFO_EFFECTIVE_URL :
1338
1338
case CURLINFO_CONTENT_TYPE : {
1339
- char * s_code ;
1339
+ char * s_code = NULL ;
1340
1340
1341
- curl_easy_getinfo (ch -> cp , option , & s_code );
1342
- RETURN_STRING (s_code , 1 );
1341
+ if (curl_easy_getinfo (ch -> cp , option , & s_code ) == CURLE_OK && s_code ) {
1342
+ RETURN_STRING (s_code , 1 );
1343
+ } else {
1344
+ RETURN_FALSE ;
1345
+ }
1343
1346
break ;
1344
1347
}
1345
1348
case CURLINFO_HTTP_CODE :
@@ -1348,10 +1351,13 @@ PHP_FUNCTION(curl_getinfo)
1348
1351
case CURLINFO_FILETIME :
1349
1352
case CURLINFO_SSL_VERIFYRESULT :
1350
1353
case CURLINFO_REDIRECT_COUNT : {
1351
- long code ;
1354
+ long code = 0 ;
1352
1355
1353
- curl_easy_getinfo (ch -> cp , option , & code );
1354
- RETURN_LONG (code );
1356
+ if (curl_easy_getinfo (ch -> cp , option , & code ) == CURLE_OK ) {
1357
+ RETURN_LONG (code );
1358
+ } else {
1359
+ RETURN_FALSE ;
1360
+ }
1355
1361
break ;
1356
1362
}
1357
1363
case CURLINFO_TOTAL_TIME :
@@ -1366,10 +1372,13 @@ PHP_FUNCTION(curl_getinfo)
1366
1372
case CURLINFO_CONTENT_LENGTH_UPLOAD :
1367
1373
case CURLINFO_STARTTRANSFER_TIME :
1368
1374
case CURLINFO_REDIRECT_TIME : {
1369
- double code ;
1375
+ double code = 0.0 ;
1370
1376
1371
- curl_easy_getinfo (ch -> cp , option , & code );
1372
- RETURN_DOUBLE (code );
1377
+ if (curl_easy_getinfo (ch -> cp , option , & code ) == CURLE_OK ) {
1378
+ RETURN_DOUBLE (code );
1379
+ } else {
1380
+ RETURN_FALSE ;
1381
+ }
1373
1382
break ;
1374
1383
}
1375
1384
}
0 commit comments