openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

libcacard/vcard_emul_nss: use pstrcpy in place of strncpy 

Replace strncpy+NUL-terminate use with use of pstrcpy.
This requires linking with cutils.o (or else vssclient doesn't link),
so add that in the Makefile.

Acked-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Jim Meyering 2012-10-04 13:09:59 +02:00 committed by Anthony Liguori
parent 1ab516ed9b
commit 2e679780ae
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libcacard/Makefile
View File

@ -14,6 +14,9 @@ QEMU_CFLAGS+=-I../
libcacard.lib-y=$(patsubst %.o,%.lo,$(libcacard-y)) libcacard.lib-y=$(patsubst %.o,%.lo,$(libcacard-y))
vscclient: $(libcacard-y) $(QEMU_OBJS) vscclient.o cutils.o
$(call quiet-command,$(CC) -o $@ $^ $(libcacard_libs) $(LIBS)," LINK $@")
clean: clean:
rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo */*.lo .libs/* */.libs/* *.la */*.la *.pc rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo */*.lo .libs/* */.libs/* *.la */*.la *.pc
rm -Rf .libs */.libs rm -Rf .libs */.libs

3
libcacard/vcard_emul_nss.c
View File

@ -1169,8 +1169,7 @@ vcard_emul_options(const char *args)
NEXT_TOKEN(vname) NEXT_TOKEN(vname)
NEXT_TOKEN(type_params) NEXT_TOKEN(type_params)
type_params_length = MIN(type_params_length, sizeof(type_str)-1); type_params_length = MIN(type_params_length, sizeof(type_str)-1);
strncpy(type_str, type_params, type_params_length); pstrcpy(type_str, type_params_length, type_params);
type_str[type_params_length] = 0;
type = vcard_emul_type_from_string(type_str); type = vcard_emul_type_from_string(type_str);
NEXT_TOKEN(type_params) NEXT_TOKEN(type_params)