From 54005a721df48cacf0cc0415d574f1044f1f3743 Mon Sep 17 00:00:00 2001 From: Andrew Berry Date: Mon, 13 Jun 2011 10:49:50 -0400 Subject: [PATCH] Issue #1186992: Fix jplayer_get_version() when an invalid directory is passed. --- jplayer.module | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/jplayer.module b/jplayer.module index 46fe0d1..bee9d8f 100644 --- a/jplayer.module +++ b/jplayer.module @@ -257,6 +257,11 @@ function jplayer_library() { * * @param $directory * The directory to check for a jPlayer installation. + * + * @return + * An array containing 'version', 'major, and 'minor' keys representing the + * version of jPlayer installed, or FALSE if a valid version number was not + * found. */ function jplayer_get_version($directory = NULL) { $version = 0; @@ -284,6 +289,12 @@ function jplayer_get_version($directory = NULL) { $parts = explode('.', $version); + // Though other parts of the module may check for a specific version, + // checking for a positive integer is more of a sanity check here. + if ($version < 1 || !isset($parts[0]) || !isset($parts[1])) { + return FALSE; + } + return array('version' => $version, 'major' => $parts[0], 'minor' => $parts[1]); } @@ -331,4 +342,5 @@ function jplayer_views_api() { 'path' => drupal_get_path('module', 'jplayer') . '/includes', 'api' => 3.0, ); -} \ No newline at end of file +} + -- 1.7.5.2