summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--util.c14
-rw-r--r--windows_installer/ted/ted/ted.vdproj6
2 files changed, 12 insertions, 8 deletions
diff --git a/util.c b/util.c
index a0e91aa..f7cbfbc 100644
--- a/util.c
+++ b/util.c
@@ -384,11 +384,15 @@ void path_full(const char *dir, const char *relpath, char *abspath, size_t abspa
} else if (component_len == 2 && relpath[0] == '.' && relpath[1] == '.') {
// ..
char *lastsep = strrchr(abspath, PATH_SEPARATOR);
- assert(lastsep);
- if (lastsep == abspath)
- lastsep[1] = '\0';
- else
- lastsep[0] = '\0';
+ if (lastsep) {
+ if (lastsep == abspath)
+ lastsep[1] = '\0'; // e.g. /abc
+ else
+ lastsep[0] = '\0';
+ } else {
+ // e.g. if abspath is currently C:
+ // (do nothing)
+ }
} else {
if (len == 0 || abspath[len - 1] != PATH_SEPARATOR)
str_cat(abspath, abspath_size, PATH_SEPARATOR_STR);
diff --git a/windows_installer/ted/ted/ted.vdproj b/windows_installer/ted/ted/ted.vdproj
index a525b62..1cd163f 100644
--- a/windows_installer/ted/ted/ted.vdproj
+++ b/windows_installer/ted/ted/ted.vdproj
@@ -505,15 +505,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:ted"
- "ProductCode" = "8:{25FC25F1-870D-4CBF-8504-EB8534EF39D4}"
- "PackageCode" = "8:{9B80D3CD-2A3C-4B5A-9875-4895F4FE718F}"
+ "ProductCode" = "8:{A0786B42-C16B-4496-8982-CF5C9983F1BE}"
+ "PackageCode" = "8:{BE0F5C22-E227-437A-BBE4-6C3B838A4227}"
"UpgradeCode" = "8:{844F6C2B-DF3B-4A81-9BD5-603401BBA651}"
"AspNetVersion" = "8:2.0.50727.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:FALSE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:23.01.1225"
+ "ProductVersion" = "8:23.01.1226"
"Manufacturer" = "8:ted"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"