Search
j0ke.net Open Build Service
>
Projects
>
server:monitoring
>
rancid-stable
> rancid-2.3.8.p1
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File rancid-2.3.8.p1 of Package rancid-stable (Revision 20)
Currently displaying revision
20
,
show latest
Index: bin/hpuifilter.c =================================================================== --- bin/hpuifilter.c (revision 2395) +++ bin/hpuifilter.c (revision 2396) @@ -367,7 +367,7 @@ break; } else if (bytes > 0) { hlen -= bytes; - memcpy(hbuf, hbuf + bytes, hlen + 1); + memmove(hbuf, hbuf + bytes, hlen + 1); if (hlen < 1) pfds[2].events &= ~POLLOUT; } @@ -423,7 +423,7 @@ break; } else if (bytes > 0) { tlen -= bytes; - memcpy(tbuf, tbuf + bytes, tlen + 1); + memmove(tbuf, tbuf + bytes, tlen + 1); if (tlen < 1) pfds[1].events &= ~POLLOUT; } @@ -593,8 +593,8 @@ if (len - pmatch[0].rm_eo <= 0) { buf[pmatch[0].rm_so] = '\0'; } else { - memcpy(buf + pmatch[0].rm_so, buf + pmatch[0].rm_eo, - len - pmatch[0].rm_eo + 1); + memmove(buf + pmatch[0].rm_so, buf + pmatch[0].rm_eo, + len - pmatch[0].rm_eo + 1); } len -= pmatch[0].rm_eo - pmatch[0].rm_so; /* start over with the first regex */ @@ -616,8 +616,8 @@ if (len - pmatch[0].rm_eo == 0) { buf[pmatch[0].rm_so] = '\0'; } else { - memcpy(buf + pmatch[0].rm_so, buf + pmatch[0].rm_eo, - len - pmatch[0].rm_eo + 1); + memmove(buf + pmatch[0].rm_so, buf + pmatch[0].rm_eo, + len - pmatch[0].rm_eo + 1); } len -= pmatch[0].rm_eo - pmatch[0].rm_so; /* start over with the first CR regex */ Index: CHANGES =================================================================== --- CHANGES (revision 2395) +++ CHANGES (revision 2396) @@ -1,3 +1,6 @@ +2.3.9 + hpuifilter: dont use memcpy for overlapping regions - David Byers + 2.3.8 rancid: filter sup-bootflash if sup-bootdisk worked
