Merge branch 'rg/copy-gecos-username'
* rg/copy-gecos-username: copy_gecos: fix not adding nlen to len when processing "&"
This commit is contained in:
		
							
								
								
									
										1
									
								
								ident.c
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								ident.c
									
									
									
									
									
								
							| @ -34,6 +34,7 @@ static void copy_gecos(const struct passwd *w, char *name, size_t sz) | |||||||
| 			*dst++ = toupper(*w->pw_name); | 			*dst++ = toupper(*w->pw_name); | ||||||
| 			memcpy(dst, w->pw_name + 1, nlen - 1); | 			memcpy(dst, w->pw_name + 1, nlen - 1); | ||||||
| 			dst += nlen - 1; | 			dst += nlen - 1; | ||||||
|  | 			len += nlen; | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| 	if (len < sz) | 	if (len < sz) | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user
	 Junio C Hamano
					Junio C Hamano