Skip to content

phpdbg: couple of network function return checks. Possible #1962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
devnexen wants to merge 9 commits into from
Closed

phpdbg: couple of network function return checks. Possible #1962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2a0e5b4
phpdbg: couple of network function return checks. Possible
devnexen Jun 28, 2016
34d3034
Merge branch 'master' of https://github.com/php/php-src
devnexen Jun 28, 2016
3a7beee
useless comment
devnexen Jun 28, 2016
c1540cc
Merge branch 'master' of https://github.com/php/php-src
devnexen Jul 16, 2016
8a7247e
useless comment
devnexen Jun 28, 2016
d58834a
Merge branch 'master' of https://github.com/devnexen/php-src
Jul 19, 2016
1f81be5
Merge branch 'master' of https://github.com/php/php-src
Jul 19, 2016
de994d4
Merge branch 'master' of https://github.com/php/php-src
Jul 22, 2016
9065600
put back right ltmain.sh
devnexen Jul 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ext/session/mod_files.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ static int ps_files_cleanup_dir(const char *dirname, zend_long maxlifetime)

if (dirname_len >= MAXPATHLEN) {
php_error_docref(NULL, E_NOTICE, "ps_files_cleanup_dir: dirname(%s) is too long", dirname);
closedir(dir);
return (0);
}

Expand Down
18 changes: 16 additions & 2 deletions sapi/phpdbg/phpdbg_wait.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,10 @@ void phpdbg_webdata_decompress(char *msg, int len) {
extension = (zend_extension *) zend_llist_get_first_ex(&zend_extensions, &pos);
while (extension) {
extension = (zend_extension *) zend_llist_get_next_ex(&zend_extensions, &pos);
if (extension == NULL){
break;
}

/* php_serach_array() body should be in some ZEND_API function... */
ZEND_HASH_FOREACH_STR_KEY_PTR(Z_ARRVAL_P(zvp), strkey, name) {
if (Z_TYPE_P(name) == IS_STRING && !zend_binary_strcmp(extension->name, strlen(extension->name), Z_STRVAL_P(name), Z_STRLEN_P(name))) {
break;
Expand Down Expand Up @@ -344,9 +346,16 @@ PHPDBG_COMMAND(wait) /* {{{ */
if (PHPDBG_G(socket_server_fd) == -1) {
int len;
PHPDBG_G(socket_server_fd) = sl = socket(AF_UNIX, SOCK_STREAM, 0);
if (sl == -1) {
phpdbg_error("wait", "type=\"nosocket\" import=\"fail\"", "Unable to open a socket to UNIX domain socket at %s defined by phpdbg.path ini setting", PHPDBG_G(socket_path));
return FAILURE;
}

local.sun_family = AF_UNIX;
strcpy(local.sun_path, PHPDBG_G(socket_path));
if (strlcpy(local.sun_path, PHPDBG_G(socket_path), sizeof(local.sun_path)) > sizeof(local.sun_path)) {
phpdbg_error("wait", "type=\"nosocket\" import=\"fail\"", "Socket at %s defined by phpdbg.path ini setting is too long", PHPDBG_G(socket_path));
return FAILURE;
}
len = strlen(local.sun_path) + sizeof(local.sun_family);
if (bind(sl, (struct sockaddr *)&local, len) == -1) {
phpdbg_error("wait", "type=\"nosocket\" import=\"fail\"", "Unable to connect to UNIX domain socket at %s defined by phpdbg.path ini setting", PHPDBG_G(socket_path));
Expand All @@ -362,6 +371,11 @@ PHPDBG_COMMAND(wait) /* {{{ */

rlen = sizeof(remote);
sr = accept(sl, (struct sockaddr *) &remote, (socklen_t *) &rlen);
if (sr == -1) {
phpdbg_error("wait", "type=\"nosocket\" import=\"fail\"", "Unable to create a connection to UNIX domain socket at %s defined by phpdbg.path ini setting", PHPDBG_G(socket_path));
close(PHPDBG_G(socket_server_fd));
return FAILURE;
}

char msglen[5];
int recvd = 4;
Expand Down