Skip to content

Commit a94de84

Browse files
dschoAlexpux
authored andcommitted
convert(): warn when we cut off a path
Signed-off-by: Johannes Schindelin <[email protected]>
1 parent d75c442 commit a94de84

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

winsup/cygwin/msys2_path_conv.cc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ const char* convert(char *dst, size_t dstlen, const char *src) {
282282
*dstit = '\0';
283283
return dst;
284284
}
285+
*dstend = '\0';
285286

286287
const char* srcit = src;
287288
const char* srcbeg = src;
@@ -551,6 +552,7 @@ void subp_convert(const char** from, const char* end, int is_url, char** dst, co
551552
}
552553

553554
void ppl_convert(const char** from, const char* to, char** dst, const char* dstend) {
555+
const char *orig_dst = *dst;
554556
const char* it = *from;
555557
const char* beg = it;
556558
int prev_was_simc = 0;
@@ -568,8 +570,10 @@ void ppl_convert(const char** from, const char* to, char** dst, const char* dste
568570
subp_convert(&beg, it, is_url, dst, dstend);
569571
is_url = 0;
570572

571-
if (*dst == dstend)
572-
break;
573+
if (*dst == dstend) {
574+
system_printf("Path cut off during conversion: %s\n", orig_dst);
575+
break;
576+
}
573577

574578
**dst = ';';
575579
*dst += 1;

0 commit comments

Comments
 (0)