hyung-hwan/codepot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed a wrong type in svn_blame in svn.c

Browse Source 
added null check in code_folder.php
This commit is contained in:
hyung-hwan 2019-02-01 17:19:33 +00:00
parent 7ac64b1359
commit 1cac3839e6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codepot/pecl-svn/svn.c
View File

@ -1486,7 +1486,7 @@ PHP_FUNCTION(svn_diff)
apr_pool_t *subpool; apr_pool_t *subpool;
apr_file_t *outfile = NULL, *errfile = NULL; apr_file_t *outfile = NULL, *errfile = NULL;
svn_error_t *err; svn_error_t *err;
char *path1, *path2; const char *path1, *path2;
const char *utf8_path1 = NULL,*utf8_path2 = NULL; const char *utf8_path1 = NULL,*utf8_path2 = NULL;
const char *can_path1 = NULL,*can_path2 = NULL; const char *can_path1 = NULL,*can_path2 = NULL;
psvn_size_t path1len, path2len; psvn_size_t path1len, path2len;
@ -2725,7 +2725,7 @@ PHP_FUNCTION(svn_blame)
const char *repos_url = NULL; const char *repos_url = NULL;
const char *utf8_repos_url = NULL; const char *utf8_repos_url = NULL;
psvn_size_t repos_url_len; psvn_size_t repos_url_len;
int revision = -1; long revision = -1;
svn_error_t *err; svn_error_t *err;
svn_opt_revision_t svn_opt_revision_t
start_revision = { 0 }, start_revision = { 0 },

4
codepot/src/codepot/views/code_blame.php
View File

@ -261,7 +261,7 @@ $this->load->view (
</div> </div>
<?php <?php
if (array_key_exists('properties', $file) && count($file['properties']) > 0) if (array_key_exists('properties', $file) && !is_null($file['properties']) && count($file['properties']) > 0)
{ {
print '<ul id="code_blame_property_list">'; print '<ul id="code_blame_property_list">';
foreach ($file['properties'] as $pn => $pv) foreach ($file['properties'] as $pn => $pv)
@ -369,7 +369,7 @@ $this->load->view (
printf ('<code class="codepot-line-numbered-code prettyprint %s %s" id="code_blame_result_code">', $prettyprint_linenums, $prettyprint_lang); printf ('<code class="codepot-line-numbered-code prettyprint %s %s" id="code_blame_result_code">', $prettyprint_linenums, $prettyprint_lang);
$charset = ''; $charset = '';
if (array_key_exists('properties', $file) && count($file['properties']) > 0) if (array_key_exists('properties', $file) && !is_null($file['properties']) && count($file['properties']) > 0)
{ {
$p = &$file['properties']; $p = &$file['properties'];
if (array_key_exists('svn:mime-type', $p)) if (array_key_exists('svn:mime-type', $p))

2
codepot/src/codepot/views/code_folder.php
View File

@ -1236,7 +1236,7 @@ $this->load->view (
</div> </div>
<?php <?php
if (array_key_exists('properties', $file) && count($file['properties']) > 0) if (array_key_exists('properties', $file) && !is_null($file['properties']) && count($file['properties']) > 0)
{ {
print '<div><ul id="code_folder_property_list">'; print '<div><ul id="code_folder_property_list">';
foreach ($file['properties'] as $pn => $pv) foreach ($file['properties'] as $pn => $pv)