diff options
| author | Craig A. Berry <craigberry@mac.com> | 2011-12-31 12:31:49 -0600 |
|---|---|---|
| committer | Craig A. Berry <craigberry@mac.com> | 2011-12-31 12:31:49 -0600 |
| commit | db4c290518adacb08e858bff2ae8f18646562f67 (patch) | |
| tree | 4f7d957049e15223050e8854c8af563d791525f7 | |
| parent | ef337e16d60335fe32d9bde77eba5ef3ac36f983 (diff) | |
| download | perl-db4c290518adacb08e858bff2ae8f18646562f67.tar.gz | |
strlcpy fix-ups in vms/vms.c following a35dcc95dd24.
In three places I was using the intended string length rather than
the buffer length as the length argument, and in one place I was
assuming the return value was the number of non-null bytes copied,
which is not true when you are intentionally copying only part of
the source string. If strlcpy is supposed to be idiot-proof, they
clearly didn't anticipate the superior form of idiot I've proven
myself to be.
| -rw-r--r-- | vms/vms.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -7903,9 +7903,9 @@ int sts, v_len, r_len, d_len, n_len, e_len, vs_len; nextslash = strchr(&unixptr[1],'/'); seg_len = 0; if (nextslash != NULL) { - int cmp; + int cmp; seg_len = nextslash - &unixptr[1]; - my_strlcpy(vmspath, unixptr, seg_len + 1); + my_strlcpy(vmspath, unixptr, seg_len + 2); cmp = 1; if (seg_len == 3) { cmp = strncmp(vmspath, "dev", 4); @@ -7968,7 +7968,8 @@ int sts, v_len, r_len, d_len, n_len, e_len, vs_len; */ /* Posix to VMS destroyed this, so copy it again */ - vmslen = my_strlcpy(vmspath, &unixptr[1], seg_len); + my_strlcpy(vmspath, &unixptr[1], seg_len + 1); + vmslen = strlen(vmspath); /* We know we're truncating. */ vmsptr = &vmsptr[vmslen]; islnm = 0; @@ -9364,14 +9365,14 @@ int rms_sts; string = PerlMem_malloc(resultspec.dsc$w_length+1); if (string == NULL) _ckvmssts_noperl(SS$_INSFMEM); - my_strlcpy(string, resultspec.dsc$a_pointer, resultspec.dsc$w_length); + my_strlcpy(string, resultspec.dsc$a_pointer, resultspec.dsc$w_length+1); if (NULL == had_version) *(strrchr(string, ';')) = '\0'; if ((!had_directory) && (had_device == NULL)) { if (NULL == (devdir = strrchr(string, ']'))) devdir = strrchr(string, '>'); - my_strlcpy(string, devdir + 1, resultspec.dsc$w_length); + my_strlcpy(string, devdir + 1, resultspec.dsc$w_length+1); } /* * Be consistent with what the C RTL has already done to the rest of |