Commit 2e679780 authored by Jim Meyering's avatar Jim Meyering Committed by Anthony Liguori
Browse files

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: default avatarAlon Levy <alevy@redhat.com>
Signed-off-by: default avatarJim Meyering <meyering@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 1ab516ed

libcacard/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ QEMU_CFLAGS+=-I../ 


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:

	rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo */*.lo .libs/* */.libs/* *.la */*.la *.pc

	rm -Rf .libs */.libs

libcacard/vcard_emul_nss.c

+1 −2
Original line number Diff line number Diff line
@@ -1169,8 +1169,7 @@ vcard_emul_options(const char *args) 
            NEXT_TOKEN(vname)

            NEXT_TOKEN(type_params)

            type_params_length = MIN(type_params_length, sizeof(type_str)-1);

            strncpy(type_str, type_params, type_params_length);

            type_str[type_params_length] = 0;

            pstrcpy(type_str, type_params_length, type_params);

            type = vcard_emul_type_from_string(type_str);



            NEXT_TOKEN(type_params)