From 1cac3839e6b5031053747e5a0e5dafd1f9283115 Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Fri, 1 Feb 2019 17:19:33 +0000
Subject: [PATCH] fixed a wrong type in svn_blame in svn.c added null check in
 code_folder.php

---
 codepot/pecl-svn/svn.c                    | 4 ++--
 codepot/src/codepot/views/code_blame.php  | 4 ++--
 codepot/src/codepot/views/code_folder.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/codepot/pecl-svn/svn.c b/codepot/pecl-svn/svn.c
index 31102004..31035c98 100755
--- a/codepot/pecl-svn/svn.c
+++ b/codepot/pecl-svn/svn.c
@@ -1486,7 +1486,7 @@ PHP_FUNCTION(svn_diff)
 	apr_pool_t *subpool;
 	apr_file_t *outfile = NULL, *errfile = NULL;
 	svn_error_t *err;
-	char *path1, *path2;
+	const char *path1, *path2;
 	const char *utf8_path1 = NULL,*utf8_path2 = NULL;
 	const char *can_path1 = NULL,*can_path2 = NULL;
 	psvn_size_t path1len, path2len;
@@ -2725,7 +2725,7 @@ PHP_FUNCTION(svn_blame)
 	const char *repos_url = NULL;
 	const char *utf8_repos_url = NULL;
 	psvn_size_t repos_url_len;
-	int revision = -1;
+	long revision = -1;
 	svn_error_t *err;
 	svn_opt_revision_t
 			start_revision = { 0 },
diff --git a/codepot/src/codepot/views/code_blame.php b/codepot/src/codepot/views/code_blame.php
index d863f58d..5de8012f 100644
--- a/codepot/src/codepot/views/code_blame.php
+++ b/codepot/src/codepot/views/code_blame.php
@@ -261,7 +261,7 @@ $this->load->view (
 		</div>
 
 		<?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">';
 			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);
 
 	$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'];
 		if (array_key_exists('svn:mime-type', $p))
diff --git a/codepot/src/codepot/views/code_folder.php b/codepot/src/codepot/views/code_folder.php
index e39bb1be..a97370f9 100644
--- a/codepot/src/codepot/views/code_folder.php
+++ b/codepot/src/codepot/views/code_folder.php
@@ -1236,7 +1236,7 @@ $this->load->view (
 		</div>
 
 		<?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">';
 			foreach ($file['properties'] as $pn => $pv)